OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-Jan-2004 14:30:08 Branch: HEAD Handle: 2004012913300700 Modified files: openpkg-src/kolab kolab.spec rc.kolab Log: fix daemon path in rc; enhance version numbering; take countermeasure against user confusion through branding Summary: Revision Changes Path 1.11 +33 -5 openpkg-src/kolab/kolab.spec 1.4 +1 -1 openpkg-src/kolab/rc.kolab ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/kolab/kolab.spec ============================================================================ $ cvs diff -u -r1.10 -r1.11 kolab.spec --- openpkg-src/kolab/kolab.spec 28 Jan 2004 23:36:29 -0000 1.10 +++ openpkg-src/kolab/kolab.spec 29 Jan 2004 13:30:07 -0000 1.11 @@ -24,8 +24,9 @@ ## # package version -%define V_ei_bra 1.0 -%define V_ei_eng 1.0 +%define V_ei_maj 1.0 +%define V_ei_min 8 +%define V_ei_eng %{V_ei_maj} %define V_ei_adm 1.0.14 %define V_cf 1.0.2 @@ -45,7 +46,7 @@ %option with_cf no # list of sources -Source0: http://www.erfrakon.de/projects/kolab/download/kolab-server-%{V_ei_bra}/src/kolab-%{V_ei_eng}-%{V_ei_adm}.src.rpm +Source0: http://www.erfrakon.de/projects/kolab/download/kolab-server-%{V_ei_maj}/src/kolab-%{V_ei_eng}-%{V_ei_adm}.src.rpm Source1: ftp://ftp.zfos.org/brew/kolab/DST/cfkolab-%{V_cf}.tar.bz2 Source2: rc.kolab @@ -79,11 +80,31 @@ %prep %setup -q -c -T %{l_bzip2} -c -d %{SOURCE1} | %{l_tar} xf - - rpm2cpio <%{SOURCE0} | cpio -iv kolab-%{V_ei_bra}.tar.gz - %{l_gzip} -c -d kolab-%{V_ei_bra}.tar.gz | %{l_tar} xf - + rpm2cpio <%{SOURCE0} | cpio -iv kolab-%{V_ei_maj}.tar.gz + %{l_gzip} -c -d kolab-%{V_ei_maj}.tar.gz | %{l_tar} xf - %if "%{with_cf}" == "yes" mv cfkolab-%{V_cf}/* . + grep Version kolab_bootstrap + %{l_shtool} subst \ + -e "s;^\(# kolab_bootstrap Version .*\);\1, OpenPKG kolab-%{version}-%{release}, kolab-cf=%{V_cf};" \ + kolab_bootstrap + grep Version kolab_bootstrap + grep Version admin/kolab/index.php + %{l_shtool} subst \ + -e "s;\(>Version \).[^<]*<;\1cf-%{V_cf}<;" \ + admin/kolab/index.php + grep Version admin/kolab/index.php %else + grep Version kolab_bootstrap + %{l_shtool} subst \ + -e "s;^\(# kolab_bootstrap Version .*\);\1, OpenPKG kolab-%{version}-%{release}, kolab-ei=%{V_ei_maj}.%{V_ei_min}, engine=%{V_ei_eng}, admin=%{V_ei_adm};" \ + kolab_bootstrap + grep Version kolab_bootstrap + grep Version admin/kolab/index.php + %{l_shtool} subst \ + -e "s;\(>Version \).[^<]*<;\1ei-%{V_ei_maj}.%{V_ei_min}<;" \ + admin/kolab/index.php + grep Version admin/kolab/index.php awk <slapd.conf.template \ '// { if ($1 == "pidfile") { print $0"\nreplica-pidfile @@@kolab_prefix@@@/var/openldap/slurpd.pid" } else print }' \ >slapd.conf.template.NEW && mv slapd.conf.template.NEW slapd.conf.template @@ -159,8 +180,15 @@ # install run-command script %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d +%if "%{with_cf}" == "yes" %{l_shtool} install -c -m 755 %{l_value -s -a} \ + -e 's;@kolab_daemon@;/sbin/kolabd;' \ %{SOURCE rc.kolab} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ +%else + %{l_shtool} install -c -m 755 %{l_value -s -a} \ + -e 's;@kolab_daemon@;/etc/kolab/kolab;' \ + %{SOURCE rc.kolab} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ +%endif # generate file list %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \ @@ . patch -p0 <<'@@ .' Index: openpkg-src/kolab/rc.kolab ============================================================================ $ cvs diff -u -r1.3 -r1.4 rc.kolab --- openpkg-src/kolab/rc.kolab 22 Nov 2003 22:08:22 -0000 1.3 +++ openpkg-src/kolab/rc.kolab 29 Jan 2004 13:30:07 -0000 1.4 @@ -24,7 +24,7 @@ %start -p 600 -u @l_susr@ rcService kolab enable yes || exit 0 rcService kolab active yes && exit 0 - @l_prefix@/etc/kolab/kolab & + @l_prefix@@kolab_daemon@ & sleep 5 %stop -p 600 -u @l_susr@ @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]