Browse code

fixed and added docs replaced module Conflicts with Require

Nils Ohlmeier authored on 28/08/2003 17:31:45
Showing 1 changed files
... ...
@@ -38,8 +38,7 @@ transaction module, registrar and user location.
38 38
 %package  mysql
39 39
 Summary:  MySQL connectivity for the SIP Express Router.
40 40
 Group:    System Environment/Daemons
41
-Requires: ser
42
-Conflicts:   ser < %ver, ser-mysql < %ver
41
+Requires: ser = %ver
43 42
 BuildPrereq: mysql-devel zlib-devel
44 43
 
45 44
 %description mysql
... ...
@@ -50,8 +49,7 @@ entries.
50 49
 %package  jabber
51 50
 Summary:  sip jabber message translation support for the SIP Express Router.
52 51
 Group:    System Environment/Daemons
53
-Requires: ser
54
-Conflicts:   ser < %ver, ser-jabber < %ver
52
+Requires: ser = %ver
55 53
 BuildPrereq: expat
56 54
 
57 55
 %description jabber
... ...
@@ -60,8 +58,7 @@ The ser-jabber package contains a sip to jabber message translator.
60 58
 %package  radius
61 59
 Summary:  ser radius authentication, group and uri check modules.
62 60
 Group:    System Environment/Daemons
63
-Requires: ser
64
-Conflicts:    ser < %ver, ser-radius < %ver
61
+Requires: ser = %ver
65 62
 BuildPrereq:  radiusclient
66 63
 
67 64
 %description radius
... ...
@@ -84,22 +81,36 @@ make install skip_modules="%EXCLUDED_MODULES" \
84 81
 		basedir=$RPM_BUILD_ROOT \
85 82
 		prefix=/usr \
86 83
 		cfg-prefix=$RPM_BUILD_ROOT \
87
-		cfg-target=/%{_sysconfdir}/ser/ 
84
+		cfg-target=/%{_sysconfdir}/ser/ \
85
+		doc-prefix=$RPM_BUILD_ROOT \
86
+		doc-dir=/%{_docdir}/ser/
88 87
 make install-modules modules="modules/%MYSQL_MODULES" \
89 88
 		basedir=$RPM_BUILD_ROOT \
90 89
 		prefix=/usr \
91 90
 		cfg-prefix=$RPM_BUILD_ROOT \
92
-		cfg-target=/%{_sysconfdir}/ser/ 
91
+		cfg-target=/%{_sysconfdir}/ser/ \
92
+		doc-prefix=$RPM_BUILD_ROOT \
93
+		doc-dir=/%{_docdir}/ser/
93 94
 make install-modules modules="modules/%JABBER_MODULES" \
94 95
 		basedir=$RPM_BUILD_ROOT \
95 96
 		prefix=/usr \
96 97
 		cfg-prefix=$RPM_BUILD_ROOT \
97
-		cfg-target=/%{_sysconfdir}/ser/ 
98
+		cfg-target=/%{_sysconfdir}/ser/ \
99
+		doc-prefix=$RPM_BUILD_ROOT \
100
+		doc-dir=/%{_docdir}/ser/
98 101
 make install-modules modules="%RADIUS_MOD_PATH" \
99 102
 		basedir=$RPM_BUILD_ROOT \
100 103
 		prefix=/usr \
101 104
 		cfg-prefix=$RPM_BUILD_ROOT \
102
-		cfg-target=/%{_sysconfdir}/ser/ 
105
+		cfg-target=/%{_sysconfdir}/ser/ \
106
+		doc-prefix=$RPM_BUILD_ROOT \
107
+		doc-dir=/%{_docdir}/ser/
108
+make install-doc modules="modules/%JABBER_MODULES %RADIUS_MOD_PATH" \
109
+		basedir=$RPM_BUILD_ROOT \
110
+		prefix=/usr \
111
+		doc-prefix=$RPM_BUILD_ROOT \
112
+		doc-dir=/%{_docdir}/ser/
113
+
103 114
 
104 115
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
105 116
 install -m755 $RPM_SOURCE_DIR/ser.init.SuSE \
... ...
@@ -152,7 +163,6 @@ sbin/insserv etc/init.d/
152 163
 %doc %{_docdir}/ser/README.uri
153 164
 %doc %{_docdir}/ser/README.usrloc
154 165
 %doc %{_docdir}/ser/README.vm
155
-%doc %{_docdir}/ser/README.xlog
156 166
 
157 167
 %dir %{_sysconfdir}/ser
158 168
 %config(noreplace) %{_sysconfdir}/ser/*
... ...
@@ -203,16 +213,25 @@ sbin/insserv etc/init.d/
203 213
 %files jabber
204 214
 %defattr(-,root,root)
205 215
 %{_libdir}/ser/modules/jabber.so
216
+%doc %{_docdir}/ser/README.jabber
206 217
 
207 218
 %files radius
208 219
 %defattr(-,root,root)
209 220
 %{_libdir}/ser/modules/auth_radius.so
210 221
 %{_libdir}/ser/modules/group_radius.so
211 222
 %{_libdir}/ser/modules/uri_radius.so
223
+%doc %{_docdir}/ser/README.auth_radius
224
+%doc %{_docdir}/ser/README.group_radius
225
+%doc %{_docdir}/ser/README.uri_radius
212 226
 
213 227
 
214 228
 %changelog
215 229
 
230
+* Wed Aug 28 2003 Nils Ohlmeier <nils@iptel.org>
231
+- replaced modules Conflicts with required Ser version
232
+- fixed doc installation for SuSE pathes
233
+- added doc for jabber and radius
234
+
216 235
 * Wed Aug 28 2003 Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.fraunhofer.de>
217 236
 - added doc (READMEs, NEWS, AUTHORS a.s.o)
218 237
 - added xlog to the modules list