up to 0.7.19

diff --git a/apt-cacher-ng.spec b/apt-cacher-ng.spec
index 449951a5ff93dc8de9e3403f257b20781c71d404..98a7dde9c1607f75485655778bd046cb59565b28 100644 (file)
--- a/apt-cacher-ng.spec
+++ b/apt-cacher-ng.spec
@@ -1,16 +1,18 @@
 Summary:       Caching HTTP download proxy for software packages
 Name:          apt-cacher-ng
 Summary:       Caching HTTP download proxy for software packages
 Name:          apt-cacher-ng

-Version:       0.3.8
+Version:       0.7.19

 Release:       0.1
 License:       Public domain
 Group:         Development
 Release:       0.1
 License:       Public domain
 Group:         Development

-Source0:       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/%{name}_%version.orig.tar.gz
-# Source0-md5: d0d4b168c4b814c5ddaa6a8410610f07
+Source0:       http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/%{name}_%{version}.orig.tar.xz
+# Source0-md5: f57a1323404d35f8668911907d9d026b

 URL:           http://www.unix-ag.uni-kl.de/~bloch/acng/
 BuildRequires: boost-devel
 #BuildRequires:        bzlib-devel
 BuildRequires: libfuse-devel
 BuildRequires: libstdc++-devel
 URL:           http://www.unix-ag.uni-kl.de/~bloch/acng/
 BuildRequires: boost-devel
 #BuildRequires:        bzlib-devel
 BuildRequires: libfuse-devel
 BuildRequires: libstdc++-devel

+BuildRequires: tar >= 1:1.22
+BuildRequires: xz

 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -24,15 +26,16 @@ low resource usage.
 %setup -q
 
 %build
 %setup -q
 
 %build

-%{__make} all
+%{__make}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{_mandir}/man8/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{_mandir}/man8/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d

-install -p apt-cacher-ng $RPM_BUILD_ROOT%{_sbindir}/%{name}
-install -p acngfs $RPM_BUILD_ROOT%{_sbindir}/%{name}
-install -p in.acng expire-caller.pl distkill.pl $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p build/apt-cacher-ng $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install -p build/acngfs $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install -p build/in.acng  $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install -p expire-caller.pl distkill.pl $RPM_BUILD_ROOT%{_libdir}/%{name}

 cp -p doc/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 cp -a conf/{*mirror*,*.html,*.css} $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -a conf/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 cp -p doc/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 cp -a conf/{*mirror*,*.html,*.css} $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -a conf/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/


@@ -62,10 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc COPYING README TODO
-%{_sysconfdir}/%{name}/
-%{_sysconfdir}/xinetd.d/%{name}
+%doc README TODO INSTALL*
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xinetd.d/%{name}

 %attr(755,root,root) %{_sbindir}/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}

-%{_libdir}/%{name}/
-%{_mandir}/man8/*
-/var/log/%{name}/
+%{_libdir}/%{name}
+%{_mandir}/man8/acngfs.8*
+%{_mandir}/man8/apt-cacher-ng.8*
+%dir /var/log/%{name}