- rpm stuff merged from stable

rpm/ser.spec

@@ -1,225 +0,0 @@
-%define name    ser
-%define ver     0.8.11pre29
-%define rel     1
-
-%define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
-%define MYSQL_MODULES		mysql
-%define JABBER_MODULES		jabber
-%define RADIUS_MODULES		auth_radius group_radius uri_radius
-%define RADIUS_MOD_PATH		modules/auth_radius modules/group_radius modules/uri_radius
-
-Summary:      SIP Express Router, very fast and flexible SIP Proxy
-Name:         %name
-Version:      %ver
-Release:      %rel
-Packager:     Jan Janak <[email protected]>
-Copyright:    GPL
-Group:        System Environment/Daemons
-Source:       http://iptel.org/ser/stable/%{name}-%{ver}_src.tar.gz
-Source2:      ser.init
-URL:          http://iptel.org/ser
-Vendor:       FhG Fokus
-BuildRoot:    /var/tmp/%{name}-%{ver}-root
-BuildPrereq:  make flex bison
-
-
-%description
-Ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
-proxy server. Written entirely in C, ser can handle thousands calls
-per second even on low-budget hardware. A C Shell like scripting language
-provides full control over the server's behaviour. It's modular
-architecture allows only required functionality to be loaded.
-Currently the following modules are available: digest authentication,
-CPL scripts, instant messaging, MySQL support, a presence agent, radius
-authentication, record routing, an SMS gateway, a jabber gateway, a 
-transaction module, registrar and user location.
-
-%package  mysql
-Summary:  MySQL connectivity for the SIP Express Router.
-Group:    System Environment/Daemons
-Requires: ser
-BuildPrereq:  mysql-devel zlib-devel
-
-%description mysql
-The ser-mysql package contains MySQL database connectivity that you
-need to use digest authentication module or persistent user location
-entries.
-
-%package  jabber
-Summary:  sip jabber message translation support for the SIP Express Router.
-Group:    System Environment/Daemons
-Requires: ser
-BuildPrereq:  expat-devel
-
-%description jabber
-The ser-jabber package contains a sip to jabber message translator.
-
-%package  radius
-Summary:  ser radius authentication, group and uri check modules.
-Group:    System Environment/Daemons
-Requires: ser
-BuildPrereq:  radiusclient-devel
-
-%description radius
-The ser-radius package contains modules for radius authentication, group
- membership and uri checking.
-
-%prep
-%setup
-
-%build
-make all skip_modules="%EXCLUDED_MODULES"      cfg-target=/%{_sysconfdir}/ser/
-make modules modules="modules/%MYSQL_MODULES"  cfg-target=/%{_sysconfdir}/ser/
-make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/
-make modules modules="%RADIUS_MOD_PATH"        cfg-target=/%{_sysconfdir}/ser/
-
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
-
-make install skip_modules="%EXCLUDED_MODULES" \
-		basedir=$RPM_BUILD_ROOT \
-		prefix=/usr \
-		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
-make install-modules modules="modules/%MYSQL_MODULES" \
-		basedir=$RPM_BUILD_ROOT \
-		prefix=/usr \
-		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
-make install-modules modules="modules/%JABBER_MODULES" \
-		basedir=$RPM_BUILD_ROOT \
-		prefix=/usr \
-		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
-make install-modules modules="%RADIUS_MOD_PATH" \
-		basedir=$RPM_BUILD_ROOT \
-		prefix=/usr \
-		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
-
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
-install -m755 $RPM_SOURCE_DIR/ser.init \
-              $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ser
-
-
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-install -m755 scripts/harv_ser.sh \
-              $RPM_BUILD_ROOT/%{_bindir}/harv_ser.sh
-
-mv $RPM_BUILD_ROOT/%{_sbindir}/gen_ha1 $RPM_BUILD_ROOT/%{_bindir}
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-%post
-/sbin/chkconfig --add ser
-
-%preun
-if [ $1 = 0 ]; then
-    /sbin/service ser stop > /dev/null 2>&1
-    /sbin/chkconfig --del ser
-fi
-
-
-%files
-%defattr(-,root,root)
-%doc README
-
-%dir %{_sysconfdir}/ser
-%config(noreplace) %{_sysconfdir}/ser/*
-%config %{_sysconfdir}/rc.d/init.d/*
-
-%dir %{_libdir}/ser
-%dir %{_libdir}/ser/modules
-%{_libdir}/ser/modules/acc.so
-%{_libdir}/ser/modules/auth.so
-%{_libdir}/ser/modules/auth_db.so
-%{_libdir}/ser/modules/dbtext.so
-%{_libdir}/ser/modules/domain.so
-%{_libdir}/ser/modules/enum.so
-%{_libdir}/ser/modules/exec.so
-%{_libdir}/ser/modules/group.so
-%{_libdir}/ser/modules/maxfwd.so
-%{_libdir}/ser/modules/msilo.so
-%{_libdir}/ser/modules/nathelper.so
-%{_libdir}/ser/modules/pa.so
-%{_libdir}/ser/modules/permissions.so
-%{_libdir}/ser/modules/pike.so
-%{_libdir}/ser/modules/print.so
-%{_libdir}/ser/modules/registrar.so
-%{_libdir}/ser/modules/rr.so
-%{_libdir}/ser/modules/sl.so
-%{_libdir}/ser/modules/sms.so
-%{_libdir}/ser/modules/textops.so
-%{_libdir}/ser/modules/tm.so
-%{_libdir}/ser/modules/uri.so
-%{_libdir}/ser/modules/usrloc.so
-%{_libdir}/ser/modules/vm.so
-
-%{_sbindir}/ser
-%{_sbindir}/serctl
-
-%{_bindir}/harv_ser.sh
-%{_bindir}/gen_ha1
-
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-
-
-%files mysql
-%defattr(-,root,root)
-
-%{_libdir}/ser/modules/mysql.so
-%{_sbindir}/ser_mysql.sh
-
-%files jabber
-%defattr(-,root,root)
-
-%{_libdir}/ser/modules/jabber.so
-
-%files radius
-%defattr(-,root,root)
-
-%{_libdir}/ser/modules/auth_radius.so
-%{_libdir}/ser/modules/group_radius.so
-%{_libdir}/ser/modules/uri_radius.so
-
-
-%changelog
-
-* Sun Jun 1 2003 Andrei Pelinescu - Onciul <[email protected]>
-- added a separate rpm for the radius modules
-- updated to the new makefile variables (removed lots of unnecessary stuff)
-
-* Thu Nov 14 2002 Jan Janak <[email protected]>
-- Installing harv_ser.sh again
-- quick hack to move gen_ha1 to bin directory instead of sbin (should
-  be done from the Makefile next time)
-
-* Tue Nov 12 2002 Andrei Pelinescu - Onciul <[email protected]>
-- added a separate rpm for the jabber modules
-- moved all the binaries to sbin
-- removed obsolete installs (make install installs everything now)
-
-* Fri Oct 25 2002 Jan Janak <[email protected]>
-- Minor description fixes
-
-* Fri Oct  4 2002 Jiri Kuthan <[email protected]>
-- exec module introduced
-
-* Wed Sep 25 2002 Andrei Pelinescu - Onciul  <[email protected]>
-- modified make install & make: added cfg-target & modules-target
-
-* Sun Sep 08 2002 Jan Janak <[email protected]>
-- Created subpackage containing mysql connectivity support.
-
-* Mon Sep 02 2002 Jan Janak <[email protected]>
-- gen_ha1 utility added, scripts added.
-
-* Tue Aug 28 2002 Jan Janak <[email protected]>
-- Finished the first version of the spec file.
-
-* Sun Aug 12 2002 Jan Janak <[email protected]>
-- First version of the spec file.

rpm/ser.spec-4.1

@@ -1,5 +1,5 @@
 %define name    ser
-%define ver     0.8.11pre30
+%define ver     0.8.11
 %define rel     0
 
 %define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
@@ -38,7 +38,7 @@ transaction module, registrar and user location.
 %package  mysql
 Summary:  MySQL connectivity for the SIP Express Router.
 Group:    System Environment/Daemons
-Requires: ser
+Requires: ser = %ver
 BuildPrereq:  mysql-devel zlib-devel
 
 %description mysql
@@ -49,7 +49,7 @@ entries.
 %package  jabber
 Summary:  sip jabber message translation support for the SIP Express Router.
 Group:    System Environment/Daemons
-Requires: ser
+Requires: ser = %ver
 BuildPrereq:  expat-devel
 
 %description jabber
@@ -58,7 +58,7 @@ The ser-jabber package contains a sip to jabber message translator.
 %package  radius
 Summary:  ser radius authentication, group and uri check modules.
 Group:    System Environment/Daemons
-Requires: ser
+Requires: ser = %ver
 BuildPrereq:  radiusclient-devel
 
 %description radius
@@ -114,11 +114,6 @@ install -m755 $RPM_SOURCE_DIR/ser.init \
               $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/ser
 
 
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-install -m755 scripts/harv_ser.sh \
-              $RPM_BUILD_ROOT/%{_bindir}/harv_ser.sh
-
-mv $RPM_BUILD_ROOT/%{_sbindir}/gen_ha1 $RPM_BUILD_ROOT/%{_bindir}
 
 
 %clean
@@ -138,13 +133,13 @@ fi
 %defattr(-,root,root)
 %dir %{_docdir}/ser
 %doc %{_docdir}/ser/AUTHORS
+%doc %{_docdir}/ser/NEWS
 %doc %{_docdir}/ser/INSTALL
 %doc %{_docdir}/ser/README
 %doc %{_docdir}/ser/README-MODULES
 %doc %{_docdir}/ser/README.acc
 %doc %{_docdir}/ser/README.auth
 %doc %{_docdir}/ser/README.auth_db
-%doc %{_docdir}/ser/README.cfg
 %doc %{_docdir}/ser/README.dbtext
 %doc %{_docdir}/ser/README.domain
 %doc %{_docdir}/ser/README.enum
@@ -166,6 +161,7 @@ fi
 %doc %{_docdir}/ser/README.uri
 %doc %{_docdir}/ser/README.usrloc
 %doc %{_docdir}/ser/README.vm
+%doc %{_docdir}/ser/README.xlog
 
 %dir %{_sysconfdir}/ser
 %config(noreplace) %{_sysconfdir}/ser/*
@@ -197,12 +193,12 @@ fi
 %{_libdir}/ser/modules/uri.so
 %{_libdir}/ser/modules/usrloc.so
 %{_libdir}/ser/modules/vm.so
+%{_libdir}/ser/modules/xlog.so
 
 %{_sbindir}/ser
 %{_sbindir}/serctl
 
-%{_bindir}/harv_ser.sh
-%{_bindir}/gen_ha1
+%{_sbindir}/gen_ha1
 
 %{_mandir}/man5/*
 %{_mandir}/man8/*
@@ -233,6 +229,12 @@ fi
 
 %changelog
 
+* Wed Aug 27 2003 Andrei Pelinescu - Onciul <[email protected]>
+- changed vesion to 0.8.11
+- gen_ha1 is now left in _sbindir
+- removed harv_ser.sh
+- added xlog to the modules list
+
 * Fri Jun 6 2003 Andrei Pelinescu - Onciul <[email protected]>
 - added Conflicts:, changed vesion to 0.8.11pre30
 

rpm/ser.spec.SuSE

@@ -1,6 +1,6 @@
 %define name    ser
-%define ver     0.8.11pre29
-%define rel     1
+%define ver     0.8.11
+%define rel     0
 
 %define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
 %define MYSQL_MODULES		mysql
@@ -12,7 +12,7 @@ Summary:      SIP Express Router, very fast and flexible SIP Proxy
 Name:         %name
 Version:      %ver
 Release:      %rel
-Packager:     Nils Ohlmeier <[email protected]>
+Packager:     Nils Ohlmeier <[email protected]>
 Copyright:    GPL
 Group:        Networking/Daemons
 Source:       http://iptel.org/ser/stable/%{name}-%{ver}_src.tar.gz
@@ -20,6 +20,7 @@ Source2:      ser.init.SuSE
 URL:          http://www.iptel.org/ser
 Vendor:       FhG Fokus
 BuildRoot:    /var/tmp/%{name}-%{ver}-root
+Conflicts:    ser < %ver, ser-mysql < %ver, ser-jabber < %ver, ser-radius < %ver
 BuildPrereq:  make flex bison 
 
 
@@ -37,8 +38,8 @@ transaction module, registrar and user location.
 %package  mysql
 Summary:  MySQL connectivity for the SIP Express Router.
 Group:    System Environment/Daemons
-Requires: ser mysql
-BuildPrereq: mysql-devel
+Requires: ser = %ver
+BuildPrereq: mysql-devel zlib-devel
 
 %description mysql
 The ser-mysql package contains MySQL database connectivity that you
@@ -48,8 +49,8 @@ entries.
 %package  jabber
 Summary:  sip jabber message translation support for the SIP Express Router.
 Group:    System Environment/Daemons
-Requires: ser
-BuildPrereq:  expat
+Requires: ser = %ver
+BuildPrereq: expat
 
 %description jabber
 The ser-jabber package contains a sip to jabber message translator.
@@ -57,7 +58,7 @@ The ser-jabber package contains a sip to jabber message translator.
 %package  radius
 Summary:  ser radius authentication, group and uri check modules.
 Group:    System Environment/Daemons
-Requires: ser
+Requires: ser = %ver
 BuildPrereq:  radiusclient
 
 %description radius
@@ -80,22 +81,36 @@ make install skip_modules="%EXCLUDED_MODULES" \
 		basedir=$RPM_BUILD_ROOT \
 		prefix=/usr \
 		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
+		cfg-target=/%{_sysconfdir}/ser/ \
+		doc-prefix=$RPM_BUILD_ROOT \
+		doc-dir=/%{_docdir}/ser/
 make install-modules modules="modules/%MYSQL_MODULES" \
 		basedir=$RPM_BUILD_ROOT \
 		prefix=/usr \
 		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
+		cfg-target=/%{_sysconfdir}/ser/ \
+		doc-prefix=$RPM_BUILD_ROOT \
+		doc-dir=/%{_docdir}/ser/
 make install-modules modules="modules/%JABBER_MODULES" \
 		basedir=$RPM_BUILD_ROOT \
 		prefix=/usr \
 		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
+		cfg-target=/%{_sysconfdir}/ser/ \
+		doc-prefix=$RPM_BUILD_ROOT \
+		doc-dir=/%{_docdir}/ser/
 make install-modules modules="%RADIUS_MOD_PATH" \
 		basedir=$RPM_BUILD_ROOT \
 		prefix=/usr \
 		cfg-prefix=$RPM_BUILD_ROOT \
-		cfg-target=/%{_sysconfdir}/ser/ 
+		cfg-target=/%{_sysconfdir}/ser/ \
+		doc-prefix=$RPM_BUILD_ROOT \
+		doc-dir=/%{_docdir}/ser/
+make install-doc modules="modules/%JABBER_MODULES %RADIUS_MOD_PATH" \
+		basedir=$RPM_BUILD_ROOT \
+		prefix=/usr \
+		doc-prefix=$RPM_BUILD_ROOT \
+		doc-dir=/%{_docdir}/ser/
+
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
 install -m755 $RPM_SOURCE_DIR/ser.init.SuSE \
@@ -117,7 +132,37 @@ sbin/insserv etc/init.d/
 
 %files
 %defattr(-,root,root)
-%doc README
+%dir %{_docdir}/ser
+%doc %{_docdir}/ser/AUTHORS
+%doc %{_docdir}/ser/NEWS
+%doc %{_docdir}/ser/INSTALL
+%doc %{_docdir}/ser/README
+%doc %{_docdir}/ser/README-MODULES
+%doc %{_docdir}/ser/README.acc
+%doc %{_docdir}/ser/README.auth
+%doc %{_docdir}/ser/README.auth_db
+%doc %{_docdir}/ser/README.dbtext
+%doc %{_docdir}/ser/README.domain
+%doc %{_docdir}/ser/README.enum
+%doc %{_docdir}/ser/README.exec
+%doc %{_docdir}/ser/README.group
+%doc %{_docdir}/ser/README.maxfwd
+%doc %{_docdir}/ser/README.msilo
+%doc %{_docdir}/ser/README.nathelper
+%doc %{_docdir}/ser/README.pa
+%doc %{_docdir}/ser/README.permissions
+%doc %{_docdir}/ser/README.pike
+%doc %{_docdir}/ser/README.print
+%doc %{_docdir}/ser/README.registrar
+%doc %{_docdir}/ser/README.rr
+%doc %{_docdir}/ser/README.sl
+%doc %{_docdir}/ser/README.sms
+%doc %{_docdir}/ser/README.textops
+%doc %{_docdir}/ser/README.tm
+%doc %{_docdir}/ser/README.uri
+%doc %{_docdir}/ser/README.usrloc
+%doc %{_docdir}/ser/README.vm
+%doc %{_docdir}/ser/README.xlog
 
 %dir %{_sysconfdir}/ser
 %config(noreplace) %{_sysconfdir}/ser/*
@@ -149,6 +194,7 @@ sbin/insserv etc/init.d/
 %{_libdir}/ser/modules/uri.so
 %{_libdir}/ser/modules/usrloc.so
 %{_libdir}/ser/modules/vm.so
+%{_libdir}/ser/modules/xlog.so
 
 %{_sbindir}/ser
 %{_sbindir}/serctl
@@ -167,16 +213,39 @@ sbin/insserv etc/init.d/
 %files jabber
 %defattr(-,root,root)
 %{_libdir}/ser/modules/jabber.so
+%doc %{_docdir}/ser/README.jabber
 
 %files radius
 %defattr(-,root,root)
 %{_libdir}/ser/modules/auth_radius.so
 %{_libdir}/ser/modules/group_radius.so
 %{_libdir}/ser/modules/uri_radius.so
+%doc %{_docdir}/ser/README.auth_radius
+%doc %{_docdir}/ser/README.group_radius
+%doc %{_docdir}/ser/README.uri_radius
 
 
 %changelog
 
+* Wed Aug 28 2003 Nils Ohlmeier <[email protected]>
+- replaced modules Conflicts with required Ser version
+- fixed doc installation for SuSE pathes
+- added doc for jabber and radius
+
+* Wed Aug 28 2003 Andrei Pelinescu - Onciul <[email protected]>
+- added doc (READMEs, NEWS, AUTHORS a.s.o)
+- added xlog to the modules list
+
+* Wed Aug 27 2003 Nils Ohlmeier <[email protected]>
+- fixed module dependencys
+- added Conflicts for modules
+
+* Wed Aug 27 2003 Andrei Pelinescu - Onciul <[email protected]>
+- changed vesion to 0.8.11
+- gen_ha1 is now left in _sbindir
+- removed harv_ser.sh
+- added Conflicts
+
 * Mon Jun 2 2003 Andrei Pelinescu - Onciul <[email protected]>
 - added a separate rpm for the radius modules
 - updated to the new makefile variables (removed lots of unnecessary stuff)