Browse code

- more rpm fixes (building rh rpm really works now) - added make dist (alias to make tar) - make tar will create the archive in the crt. dir (source dir). When unpacked the archive will expand under ser-$(RELEALE)/ (e.g ser-0.8.11pre29/). - the tar.gz will exclude now all *.o, *.so, *.il, *.d, tmp/*, test/*, CVS

Andrei Pelinescu-Onciul authored on 02/06/2003 11:44:20
Showing 2 changed files
... ...
@@ -140,13 +140,33 @@ dbg: ser
140 140
 	gdb -command debug.gdb
141 141
 
142 142
 .PHONY: tar
143
-tar: mantainer-clean 
143
+.PHONY: dist
144
+
145
+dist: tar
146
+
147
+tar: 
144 148
 	$(TAR) -C .. \
145 149
 		--exclude=$(notdir $(CURDIR))/test* \
146 150
 		--exclude=$(notdir $(CURDIR))/tmp* \
147 151
 		--exclude=$(notdir $(CURDIR))/debian/ser* \
148 152
 		--exclude=CVS* \
149
-		 -zcf ../$(NAME)-$(RELEASE)_src.tar.gz  $(notdir $(CURDIR)) 
153
+		--exclude=*.[do] \
154
+		--exclude=*.so \
155
+		--exclude=*.il \
156
+		--exclude=$(notdir $(CURDIR))/ser \
157
+		--exclude=*.gz \
158
+		--exclude=*.bz2 \
159
+		--exclude=*.tar \
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) \
166
+			                    -zcf ../../"$(NAME)-$(RELEASE)_src".tar.gz \
167
+			                               "$(NAME)-$(RELEASE)" ) ; \
168
+			    rm -rf tmp/_tar
169
+#		 -zcf ../$(NAME)-$(RELEASE)_src.tar.gz  $(notdir $(CURDIR)) 
150 170
 
151 171
 # binary dist. tar.gz
152 172
 .PHONY: bin
... ...
@@ -2,13 +2,11 @@
2 2
 %define ver     0.8.11pre29
3 3
 %define rel     0
4 4
 
5
-%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius \
6
-							postgress snmp cpl cpl-c ext extcmd mangler pdt
5
+%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
7 6
 %define MYSQL_MODULES		mysql
8 7
 %define JABBER_MODULES		jabber
9 8
 %define RADIUS_MODULES		auth_radius group_radius uri_radius
10
-%define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius \
11
-							modules/uri_radius
9
+%define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius modules/uri_radius
12 10
 
13 11
 Summary:      SIP Express Router, very fast and flexible SIP Proxy
14 12
 Name:         %name
... ...
@@ -60,7 +58,7 @@ The ser-jabber package contains a sip to jabber message translator.
60 60
 Summary:  ser radius authentication, group and uri check modules.
61 61
 Group:    System Environment/Daemons
62 62
 Requires: ser
63
-BuildPrereq:  libradius1-dev
63
+BuildPrereq:  radiusclient-devel
64 64
 
65 65
 %description radius
66 66
 The ser-radius package contains modules for radius authentication, group
... ...
@@ -82,22 +80,22 @@ make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
82 82
 make install skip_modules="%EXCLUDED_MODULES" \
83 83
 		basedir=$RPM_BUILD_ROOT \
84 84
 		prefix=/usr \
85
-		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
85
+		cfg-prefix=$RPM_BUILD_ROOT \
86 86
 		cfg-target=/%{_sysconfdir}/ser/ 
87 87
 make install-modules modules="modules/%MYSQL_MODULES" \
88 88
 		basedir=$RPM_BUILD_ROOT \
89 89
 		prefix=/usr \
90
-		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
90
+		cfg-prefix=$RPM_BUILD_ROOT \
91 91
 		cfg-target=/%{_sysconfdir}/ser/ 
92 92
 make install-modules modules="modules/%JABBER_MODULES" \
93 93
 		basedir=$RPM_BUILD_ROOT \
94 94
 		prefix=/usr \
95
-		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
95
+		cfg-prefix=$RPM_BUILD_ROOT \
96 96
 		cfg-target=/%{_sysconfdir}/ser/ 
97 97
 make install-modules modules="%RADIUS_MOD_PATH" \
98 98
 		basedir=$RPM_BUILD_ROOT \
99 99
 		prefix=/usr \
100
-		cfg-prefix=$RPM_BUILD_ROOT/%{_sysconfdir} \
100
+		cfg-prefix=$RPM_BUILD_ROOT \
101 101
 		cfg-target=/%{_sysconfdir}/ser/ 
102 102
 
103 103
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
... ...
@@ -187,10 +185,6 @@ fi
187 187
 %{_libdir}/ser/modules/auth_radius.so
188 188
 %{_libdir}/ser/modules/group_radius.so
189 189
 %{_libdir}/ser/modules/uri_radius.so
190
-* Tue Nov 12 2002 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.gmd.de>
191
-- added a separate rpm for the jabber modules
192
-- moved all the binaries to sbin
193
-- removed obsolete installs (make install installs everything now)
194 190
 
195 191
 
196 192
 %changelog