Browse code

- makefile make tar updated - freebsd & solaris packages fixes - suse .spec updated (not tested though, I don't have any SuSe machine)

Andrei Pelinescu-Onciul authored on 02/06/2003 15:13:51
Showing 6 changed files
... ...
@@ -19,6 +19,7 @@
19 19
 #  2003-05-30  added extra_defs & EXTRA_DEFS
20 20
 #               Makefile.defs force-included to allow recursive make
21 21
 #               calls -- see comment (andrei)
22
+#  2003-06-02   make tar changes -- unpacks in $NAME-$RELEASE  (andrei)
22 23
 #
23 24
 
24 25
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
... ...
@@ -158,15 +159,14 @@ tar:
158 158
 		--exclude=*.bz2 \
159 159
 		--exclude=*.tar \
160 160
 		-cf - $(notdir $(CURDIR)) | \
161
-			(mkdir -p tmp/_tar; \
162
-			    cd tmp/_tar; $(TAR) -xf - ) && \
163
-			    mv tmp/_tar/$(notdir $(CURDIR)) \
164
-			                  tmp/_tar/"$(NAME)-$(RELEASE)" && \
165
-			    (cd tmp/_tar && $(TAR) \
161
+			(mkdir -p tmp/_tar1; mkdir -p tmp/_tar2 ; \
162
+			    cd tmp/_tar1; $(TAR) -xf - ) && \
163
+			    mv tmp/_tar1/$(notdir $(CURDIR)) \
164
+			       tmp/_tar2/"$(NAME)-$(RELEASE)" && \
165
+			    (cd tmp/_tar2 && $(TAR) \
166 166
 			                    -zcf ../../"$(NAME)-$(RELEASE)_src".tar.gz \
167 167
 			                               "$(NAME)-$(RELEASE)" ) ; \
168
-			    rm -rf tmp/_tar
169
-#		 -zcf ../$(NAME)-$(RELEASE)_src.tar.gz  $(notdir $(CURDIR)) 
168
+			    rm -rf tmp/_tar1; rm -rf tmp/_tar2
170 169
 
171 170
 # binary dist. tar.gz
172 171
 .PHONY: bin
... ...
@@ -9,9 +9,9 @@
9 9
 
10 10
 
11 11
 PORTNAME= ser
12
-PORTVERSION= 0.8.10
12
+PORTVERSION= 0.8.11pre29
13 13
 CATEGORIES= net
14
-MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.10/src/
14
+MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.11pre29/src/
15 15
 
16 16
 MAINTAINER= pelinescu-onciul@fokus.fraunhofer.de
17 17
 
... ...
@@ -23,7 +23,7 @@ MANCOMPRESSED= no
23 23
 USE_GMAKE= yes
24 24
 # we override the DISTFILE NAME
25 25
 DISTNAME= ${PORTNAME}-${PORTVERSION}_src
26
-WRKSRC= ${WRKDIR}/sip_router
26
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27 27
 
28 28
 pre-fetch:
29 29
 	@echo "DEBUG: distfile=${DISTFILE}, distname=${DISTNAME}, w=${WRKSRC}"
... ...
@@ -1 +1 @@
1
-MD5 (ser-0.8.10_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
1
+MD5 (ser-0.8.11pre29_src.tar.gz) = 070509795c5be4fe684dbfc36d42780a
... ...
@@ -29,38 +29,37 @@ lib/ser/modules/tm.so
29 29
 lib/ser/modules/uri.so
30 30
 lib/ser/modules/usrloc.so
31 31
 lib/ser/modules/vm.so
32
-doc/ser/README
33
-doc/ser/README.cfg
34
-doc/ser/INSTALL
35
-doc/ser/README-MODULES
36
-doc/ser/AUTHORS
37
-doc/ser/README.acc
38
-doc/ser/README.auth
39
-doc/ser/README.auth_db
40
-doc/ser/README.dbtext
41
-doc/ser/README.domain
42
-doc/ser/README.enum
43
-doc/ser/README.exec
44
-doc/ser/README.group
45
-doc/ser/README.jabber
46
-doc/ser/README.maxfwd
47
-doc/ser/README.msilo
48
-doc/ser/README.mysql
49
-doc/ser/README.nathelper
50
-doc/ser/README.pa
51
-doc/ser/README.permissions
52
-doc/ser/README.pike
53
-doc/ser/README.print
54
-doc/ser/README.registrar
55
-doc/ser/README.rr
56
-doc/ser/README.sl
57
-doc/ser/README.sms
58
-doc/ser/README.textops
59
-doc/ser/README.tm
60
-doc/ser/README.uri
61
-doc/ser/README.usrloc
62
-doc/ser/README.vm
63
-@dirrm doc/ser
32
+share/doc/ser/README
33
+share/doc/ser/README.cfg
34
+share/doc/ser/INSTALL
35
+share/doc/ser/README-MODULES
36
+share/doc/ser/AUTHORS
37
+share/doc/ser/README.acc
38
+share/doc/ser/README.auth
39
+share/doc/ser/README.auth_db
40
+share/doc/ser/README.domain
41
+share/doc/ser/README.dbtext
42
+share/doc/ser/README.enum
43
+share/doc/ser/README.exec
44
+share/doc/ser/README.group
45
+share/doc/ser/README.jabber
46
+share/doc/ser/README.maxfwd
47
+share/doc/ser/README.msilo
48
+share/doc/ser/README.nathelper
49
+share/doc/ser/README.pa
50
+share/doc/ser/README.permissions
51
+share/doc/ser/README.pike
52
+share/doc/ser/README.print
53
+share/doc/ser/README.registrar
54
+share/doc/ser/README.rr
55
+share/doc/ser/README.sl
56
+share/doc/ser/README.sms
57
+share/doc/ser/README.textops
58
+share/doc/ser/README.tm
59
+share/doc/ser/README.uri
60
+share/doc/ser/README.usrloc
61
+share/doc/ser/README.vm
62
+@dirrm share/doc/ser
64 63
 @dirrm etc/ser
65 64
 @dirrm lib/ser/modules
66 65
 @dirrm lib/ser
... ...
@@ -1,7 +1,13 @@
1 1
 %define name    ser
2
-%define ver     0.8.10
3
-%define rel     2
4
-%define exclude CVS radius_acc radius_auth snmp mysql jabber
2
+%define ver     0.8.11pre29
3
+%define rel     0
4
+
5
+%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
6
+%define MYSQL_MODULES		mysql
7
+%define JABBER_MODULES		jabber
8
+%define RADIUS_MODULES		auth_radius group_radius uri_radius
9
+%define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius modules/uri_radius
10
+
5 11
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
6 12
 Name:         %name
7 13
 Version:      %ver
... ...
@@ -48,45 +54,48 @@ BuildPrereq:  expat
48 48
 %description jabber
49 49
 The ser-jabber package contains a sip to jabber message translator.
50 50
 
51
+%package  radius
52
+Summary:  ser radius authentication, group and uri check modules.
53
+Group:    System Environment/Daemons
54
+Requires: ser
55
+BuildPrereq:  radiusclient-devel
56
+
57
+%description radius
58
+The ser-radius package contains modules for radius authentication, group
59
+ membership and uri checking.
51 60
 
52 61
 %prep
53 62
 %setup
54 63
 
55 64
 %build
56
-make all exclude_modules="%exclude" cfg-target=/%{_sysconfdir}/ser/
57
-make modules modules=modules/mysql  cfg-target=/%{_sysconfdir}/ser/
58
-make modules modules=modules/jabber cfg-target=/%{_sysconfdir}/ser/
65
+make all skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
66
+make modules modules="modules/%MYSQL_MODULES"  cfg-target=/%{_sysconfdir}/ser/
67
+make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/
68
+make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
59 69
 
60 70
 %install
61 71
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
62 72
 
63
-make install cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
64
-             cfg-dir=ser/ \
65
-	     bin-prefix=$RPM_BUILD_ROOT/%{_sbindir} \
66
-	     bin-dir="" \
67
-	     modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
68
-	     modules-dir=modules/ \
69
-	     doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
70
-	     doc-dir=ser/ \
71
-	     man-prefix=$RPM_BUILD_ROOT/%{_mandir} \
72
-	     man-dir="" \
73
-		 cfg-target=/%{_sysconfdir}/ser/ \
74
-		 modules-target=/%{_libdir}/ser/modules/ \
75
-	     exclude_modules="%exclude"
76
-make install-modules modules=modules/mysql \
77
-           modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
78
-           modules-dir=modules/ \
79
-           doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
80
-           doc-dir=ser/ \
81
-           cfg-target=/%{_sysconfdir}/ser/ \
82
-           modules-target=/%{_libdir}/ser/modules/
83
-make install-modules modules=modules/jabber \
84
-           modules-prefix=$RPM_BUILD_ROOT/%{_libdir}/ser \
85
-           modules-dir=modules/ \
86
-           doc-prefix=$RPM_BUILD_ROOT/%{_docdir} \
87
-           doc-dir=ser/ \
88
-           cfg-target=/%{_sysconfdir}/ser/ \
89
-           modules-target=/%{_libdir}/ser/modules/
73
+make install skip_modules="%EXCLUDED_MODULES" \
74
+		basedir=$RPM_BUILD_ROOT \
75
+		prefix=/usr \
76
+		cfg-prefix=$RPM_BUILD_ROOT \
77
+		cfg-target=/%{_sysconfdir}/ser/ 
78
+make install-modules modules="modules/%MYSQL_MODULES" \
79
+		basedir=$RPM_BUILD_ROOT \
80
+		prefix=/usr \
81
+		cfg-prefix=$RPM_BUILD_ROOT \
82
+		cfg-target=/%{_sysconfdir}/ser/ 
83
+make install-modules modules="modules/%JABBER_MODULES" \
84
+		basedir=$RPM_BUILD_ROOT \
85
+		prefix=/usr \
86
+		cfg-prefix=$RPM_BUILD_ROOT \
87
+		cfg-target=/%{_sysconfdir}/ser/ 
88
+make install-modules modules="%RADIUS_MOD_PATH" \
89
+		basedir=$RPM_BUILD_ROOT \
90
+		prefix=/usr \
91
+		cfg-prefix=$RPM_BUILD_ROOT \
92
+		cfg-target=/%{_sysconfdir}/ser/ 
90 93
 
91 94
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
92 95
 install -m755 $RPM_SOURCE_DIR/ser.init.SuSE \
... ...
@@ -118,10 +127,17 @@ sbin/insserv etc/init.d/
118 118
 %dir %{_libdir}/ser/modules
119 119
 %{_libdir}/ser/modules/acc.so
120 120
 %{_libdir}/ser/modules/auth.so
121
+%{_libdir}/ser/modules/auth_db.so
122
+%{_libdir}/ser/modules/dbtext.so
123
+%{_libdir}/ser/modules/domain.so
124
+%{_libdir}/ser/modules/enum.so
121 125
 %{_libdir}/ser/modules/exec.so
122
-%{_libdir}/ser/modules/im.so
126
+%{_libdir}/ser/modules/group.so
123 127
 %{_libdir}/ser/modules/maxfwd.so
124 128
 %{_libdir}/ser/modules/msilo.so
129
+%{_libdir}/ser/modules/nathelper.so
130
+%{_libdir}/ser/modules/pa.so
131
+%{_libdir}/ser/modules/permissions.so
125 132
 %{_libdir}/ser/modules/pike.so
126 133
 %{_libdir}/ser/modules/print.so
127 134
 %{_libdir}/ser/modules/registrar.so
... ...
@@ -130,7 +146,9 @@ sbin/insserv etc/init.d/
130 130
 %{_libdir}/ser/modules/sms.so
131 131
 %{_libdir}/ser/modules/textops.so
132 132
 %{_libdir}/ser/modules/tm.so
133
+%{_libdir}/ser/modules/uri.so
133 134
 %{_libdir}/ser/modules/usrloc.so
135
+%{_libdir}/ser/modules/vm.so
134 136
 
135 137
 %{_sbindir}/ser
136 138
 %{_sbindir}/serctl
... ...
@@ -150,8 +168,19 @@ sbin/insserv etc/init.d/
150 150
 %defattr(-,root,root)
151 151
 %{_libdir}/ser/modules/jabber.so
152 152
 
153
+%files radius
154
+%defattr(-,root,root)
155
+%{_libdir}/ser/modules/auth_radius.so
156
+%{_libdir}/ser/modules/group_radius.so
157
+%{_libdir}/ser/modules/uri_radius.so
158
+
153 159
 
154 160
 %changelog
161
+
162
+* Mon Jun 2 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
163
+- added a separate rpm for the radius modules
164
+- updated to the new makefile variables (removed lots of unnecessary stuff)
165
+
155 166
 * Tue Nov 12 2002 Nils Ohlmeier <ohlmeier@fokus.fhg.de>
156 167
 - replaced expat-devel with expat
157 168
 - removed leading + from a few lines
... ...
@@ -55,7 +55,6 @@ f none doc/ser/README.group 0644 bin bin
55 55
 f none doc/ser/README.jabber 0644 bin bin
56 56
 f none doc/ser/README.maxfwd 0644 bin bin
57 57
 f none doc/ser/README.msilo 0644 bin bin
58
-f none doc/ser/README.mysql 0644 bin bin
59 58
 f none doc/ser/README.nathelper 0644 bin bin
60 59
 f none doc/ser/README.pa 0644 bin bin
61 60
 f none doc/ser/README.permissions 0644 bin bin