- more s|/var/log/archiv|/var/log/archive|g

[packages/frox.git] / frox.spec

diff --git a/frox.spec b/frox.spec
index d17107b8ab96bef2e0dde84a9a24cb4abfc8b115..9e2746a31527a8aab91776e77263bd51e0693f00 100644 (file)
--- a/frox.spec
+++ b/frox.spec
@@ -1,16 +1,11 @@
-#
 # Conditional build:
-%bcond_with    kernel22
+%bcond_without libiptc         # doesn't build with 2.2 kernel
 #
 Summary:       Transparent FTP proxy
-Summary(pl):   Przezroczyste proxy FTP
+Summary(pl.UTF-8):     Przezroczyste proxy FTP
 Name:          frox
 Version:       0.7.18
-%if %{with kernel22}
-Release:       1@2.2
-%else
-Release:       1
-%endif
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://frox.sourceforge.net/download/%{name}-%{version}.tar.bz2
@@ -21,17 +16,18 @@ Patch0:             %{name}-config.patch
 URL:           http://frox.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: rpmbuild(macros) >= 1.202
-PreReq:                rc-scripts
+BuildRequires: linux-libc-headers >= 7:2.6.12.0-12
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/groupdel
+Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/groupmod
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
-Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 Provides:      group(frox)
 Provides:      user(frox)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,10 +37,10 @@ Frox is transparent FTP proxy. It also has support for non-transparent
 connections, caching of anonymous ftp, and active --> passive
 conversion of data connections.
 
-%description -l pl
-Frox to przezroczyste proxy FTP, posiada równie¿ wsparcie do
-nieprzezroczystych po³±czeñ, buforowania anonimowego ftp, i konwersji
-po³±czeñ z aktywnych na pasywne.
+%description -l pl.UTF-8
+Frox to przezroczyste proxy FTP, posiada również wsparcie do
+nieprzezroczystych połączeń, buforowania anonimowego ftp, i konwersji
+połączeń z aktywnych na pasywne.
 
 %prep
 %setup -q
@@ -56,8 +52,7 @@ po
 %configure \
        --enable-http-cache \
        --enable-local-cache \
-       %{?!with_kernel22:--enable-libiptc} \
-       %{?with_kernel22:--disable-libiptc} \
+       --%{!?with_iptc:dis}%{?with_iptc:en}able-libiptc \
        --enable-transparent-data \
        --enable-configfile=%{_sysconfdir}/frox.conf
 %{__make}
@@ -66,7 +61,7 @@ po
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/lib/frox,%{_mandir}/man{5,8}} \
        $RPM_BUILD_ROOT/etc/{logrotate.d,sysconfig,rc.d/init.d} \
-       $RPM_BUILD_ROOT/var/{log/{archiv/frox,frox},cache/frox}
+       $RPM_BUILD_ROOT/var/{log/{archive/frox,frox},cache/frox}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -79,7 +74,7 @@ install %{SOURCE2}    $RPM_BUILD_ROOT/etc/sysconfig/frox
 
 cat >$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/frox << EOF
 /var/log/frox/frox-log {
-       olddir /var/log/archiv/frox
+       olddir /var/log/archive/frox
        nocreate
 }
 EOF
@@ -96,23 +91,17 @@ fi
 if [ -n "`id -u frox 2>/dev/null`" ] && [ "`/bin/id -u frox`" = 97 ]; then
        /usr/sbin/usermod -u 103 frox
        chown -R frox:frox /var/cache/frox ||:
-       chown -R root:frox /var/log/frox /var/log/archiv/frox ||:
+       chown -R root:frox /var/log/frox /var/log/archive/frox ||:
 fi
 %useradd -u 103 -s /bin/false -g frox -c "FROX ftp caching daemon" -d /var/cache/frox frox
 
 %post
 /sbin/chkconfig --add frox
-if [ -f /var/lock/subsys/frox ]; then
-       /etc/rc.d/init.d/frox restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/frox start\" to start frox daemons."
-fi
+%service frox restart "frox daemons"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/frox ]; then
-               /etc/rc.d/init.d/frox stop >&2
-       fi
+       %service frox stop
        /sbin/chkconfig --del frox
 fi
 
@@ -132,6 +121,6 @@ fi
 %attr(755,root,root) %{_sbindir}/frox
 %attr(770,root,frox) /var/lib/frox
 %attr(770,root,frox) /var/log/frox
-%attr(770,root,frox) /var/log/archiv/frox
+%attr(770,root,frox) /var/log/archive/frox
 %attr(770,frox,frox) /var/cache/frox
 %{_mandir}/man*/*