Hello community,
here is the log from the commit of package wwwoffle for openSUSE:Factory
checked in at Tue Jul 12 10:52:43 CEST 2011.
--------
--- wwwoffle/wwwoffle.changes 2011-04-11 11:26:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/wwwoffle/wwwoffle.changes 2011-05-01 22:22:39.000000000 +0200
@@ -1,0 +2,7 @@
+Sun May 1 20:21:45 UTC 2011 - chris@computersalat.de
+
+- spec-cleanup
+ o fix macros,...
+ o remove author from description
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wwwoffle.spec ++++++
--- /var/tmp/diff_new_pack.1NuNno/_old 2011-07-12 10:28:21.000000000 +0200
+++ /var/tmp/diff_new_pack.1NuNno/_new 2011-07-12 10:28:21.000000000 +0200
@@ -15,29 +15,33 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: wwwoffle
-BuildRequires: flex gnutls-devel htdig-devel zlib-devel
+Summary: World Wide Web Offline Proxy
+Version: 2.9g
+Release: 3
License: GPLv2+
Group: Productivity/Networking/Web/Proxy
-AutoReqProv: on
-Summary: World Wide Web Offline Proxy
Url: http://gedanken.demon.co.uk/wwwoffle/
-Version: 2.9g
-Release: 1
-#Source0: http://gedanken.demon.co.uk/download-wwwoffle/%{name}-%{version}.tar.bz2
-Source0: %{name}-%{version}.tar.bz2
-Source1: rc.%name
-Source3: ip-up.%name
-Source4: ip-down.%name
-Source5: %name.cron
-Patch0: %name-2.8d-IndexProtocol.diff
-Patch1: %name-2.9e-implicit.patch
-Patch2: %name-2.9e-res_init.diff
+Source0: http://gedanken.demon.co.uk/download-wwwoffle/%{name}-%{version}.tar.bz2
+Source1: rc.%{name}
+Source3: ip-up.%{name}
+Source4: ip-down.%{name}
+Source5: %{name}.cron
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch0: %{name}-2.8d-IndexProtocol.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch1: %{name}-2.9e-implicit.patch
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+Patch2: %{name}-2.9e-res_init.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %insserv_prereq %fillup_prereq
+PreReq: %fillup_prereq
+PreReq: %insserv_prereq
+BuildRequires: flex
+BuildRequires: gnutls-devel
+BuildRequires: htdig-devel
+BuildRequires: zlib-devel
Requires: cron
%description
@@ -58,58 +62,46 @@
- All options controlled using a simple configuration file with a web
page to edit it.
-
-
-Authors:
---------
- Andreas Dietrich
- Andrew M. Bishop
- Axel Rasmus Wienberg <2wienbe@informatik.uni-hamburg.de>
- Tilman Bohn
- Ullrich von Bassewitz
- Walter Pfannenmller
- Yannick Versley
-
%prep
%setup -q
%patch0 -b _orig
%patch1 -p1
%patch2 -p1
# easier to delete them now and include whole doc directory later
-rm -f doc/README.win32 doc/*/README.win32
+%{__rm} -f doc/README.win32 doc/*/README.win32
%build
export LC_ALL=C
%configure \
--with-confdir=%{_sysconfdir}/%{name} \
- --with-docdir=%_defaultdocdir/%{name} \
- --with-gnutls=%{_usr}
-make
+ --with-gcrypt \
+ --with-gnutls
+%{__make}
%install
export LC_ALL=C
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/%_sysconfdir/cron.{daily,weekly}
-make DESTDIR=$RPM_BUILD_ROOT install
-install -m 755 %SOURCE3 $RPM_BUILD_DIR
-sed "s@/etc/wwwoffle\\.conf@/etc/wwwoffle/wwwoffle.conf@g" < doc/wwwoffled.man \
- > $RPM_BUILD_ROOT%_mandir/man8/wwwoffled.8
-install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/wwwoffle
-ln -fs ../../etc/init.d/wwwoffle $RPM_BUILD_ROOT/usr/sbin/rcwwwoffle
-install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -d -m 755 $RPM_BUILD_ROOT/etc/ppp/ip-{up,down}.d
-install -m 755 %SOURCE3 $RPM_BUILD_ROOT/%_sysconfdir/ppp/ip-up.d/%name
-install -m 755 %SOURCE4 $RPM_BUILD_ROOT/%_sysconfdir/ppp/ip-down.d/%name
-install -m 644 %SOURCE5 $RPM_BUILD_ROOT/%_sysconfdir/cron.weekly/%name
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/init.d
+%{__mkdir} -p %{buildroot}/%{_sysconfdir}/cron.{daily,weekly}
+%makeinstall
+%{__install} -m 755 %{S:3} $RPM_BUILD_DIR
+%{__sed} "s@/etc/wwwoffle\\.conf@/etc/wwwoffle/wwwoffle.conf@g" < doc/wwwoffled.man \
+ > %{buildroot}%{_mandir}/man8/wwwoffled.8
+%{__install} -m 755 %{S:1} %{buildroot}/etc/init.d/%{name}
+ln -fs ../../etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
+%{__install} -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/ppp/ip-{up,down}.d
+%{__install} -m 755 %{S:3} %{buildroot}/%{_sysconfdir}/ppp/ip-up.d/%{name}
+%{__install} -m 755 %{S:4} %{buildroot}/%{_sysconfdir}/ppp/ip-down.d/%{name}
+%{__install} -m 644 %{S:5} %{buildroot}/%{_sysconfdir}/cron.weekly/%{name}
# run as wwwrun:www by default
-pushd $RPM_BUILD_ROOT%_sysconfdir/wwwoffle
-sed "s/^#run-uid.*/ run-uid = wwwrun/
- s/^#run-gid.*/ run-gid = www/" < wwwoffle.conf > wwwoffle.conf.t
-mv wwwoffle.conf.t wwwoffle.conf
+pushd %{buildroot}%{_sysconfdir}/%{name}
+%{__sed} "s/^#run-uid.*/ run-uid = wwwrun/
+ s/^#run-gid.*/ run-gid = www/" < %{name}.conf > %{name}.conf.t
+%{__mv} %{name}.conf.t %{name}.conf
popd
-rm -rf $RPM_BUILD_ROOT/usr/doc/wwwoffle
-rm -rf $RPM_BUILD_ROOT/var/spool/wwwoffle/outgoing/*
-rm -f doc/ANNOUNCE~
+%{__rm} -rf %{buildroot}%{_prefix}/doc/%{name}
+%{__rm} -rf %{buildroot}%{_localstatedir}/spool/%{name}/outgoing/*
+%{__rm} -f doc/ANNOUNCE~
%post
%fillup_and_insserv wwwoffle
@@ -122,69 +114,69 @@
%insserv_cleanup
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root)
# docs
%doc ChangeLog* LSM contrib doc/*
-%_mandir/man1/*
-%_mandir/man5/*
-%_mandir/man8/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
# wwwoffle configs
-%config /etc/init.d/wwwoffle
-%config(missingok,noreplace) %attr(755,root,root) %_sysconfdir/cron.weekly/%name
-%dir %attr(750, wwwrun, root) /etc/wwwoffle
-%config %attr(640, wwwrun, root) /etc/wwwoffle/wwwoffle.conf
-%dir /var/spool/wwwoffle/search/
+%config %{_sysconfdir}/init.d/%{name}
+%config(missingok,noreplace) %attr(755,root,root) %{_sysconfdir}/cron.weekly/%{name}
+%dir %attr(750, wwwrun, root) %{_sysconfdir}/%{name}
+%config %attr(640, wwwrun, root) %{_sysconfdir}/%{name}/%{name}.conf
+%dir %{_localstatedir}/spool/%{name}/search/
# search configs for htdig
-%dir /var/spool/wwwoffle/search/htdig
-%dir /var/spool/wwwoffle/search/htdig/conf
-%config(noreplace) /var/spool/wwwoffle/search/htdig/conf/htfuzzy.conf
-%config(noreplace) /var/spool/wwwoffle/search/htdig/conf/htsearch.conf
-%config(noreplace) /var/spool/wwwoffle/search/htdig/conf/htdig-full.conf
-%config(noreplace) /var/spool/wwwoffle/search/htdig/conf/htdig-lasttime.conf
-%config(noreplace) /var/spool/wwwoffle/search/htdig/conf/htdig-incr.conf
-%config(noreplace) /var/spool/wwwoffle/search/htdig/conf/htmerge.conf
+%dir %{_localstatedir}/spool/%{name}/search/htdig
+%dir %{_localstatedir}/spool/%{name}/search/htdig/conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/htdig/conf/htfuzzy.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/htdig/conf/htsearch.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/htdig/conf/htdig-full.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/htdig/conf/htdig-lasttime.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/htdig/conf/htdig-incr.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/htdig/conf/htmerge.conf
# search configs for mnogosearch
-%dir /var/spool/wwwoffle/search/mnogosearch
-%dir /var/spool/wwwoffle/search/mnogosearch/conf
-%config(noreplace) /var/spool/wwwoffle/search/mnogosearch/conf/indexer-full.old.conf
-%config(noreplace) /var/spool/wwwoffle/search/mnogosearch/conf/result.html
-%config(noreplace) /var/spool/wwwoffle/search/mnogosearch/conf/indexer-incr.old.conf
-%config(noreplace) /var/spool/wwwoffle/search/mnogosearch/conf/indexer-full.conf
-%config(noreplace) /var/spool/wwwoffle/search/mnogosearch/conf/indexer-incr.conf
+%dir %{_localstatedir}/spool/%{name}/search/mnogosearch
+%dir %{_localstatedir}/spool/%{name}/search/mnogosearch/conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/mnogosearch/conf/indexer-full.old.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/mnogosearch/conf/result.html
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/mnogosearch/conf/indexer-incr.old.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/mnogosearch/conf/indexer-full.conf
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/mnogosearch/conf/indexer-incr.conf
# search configs for namazu
-%dir /var/spool/wwwoffle/search/namazu
-%dir /var/spool/wwwoffle/search/namazu/conf/
-%config(noreplace) /var/spool/wwwoffle/search/namazu/conf/mknmzrc
-%config(noreplace) /var/spool/wwwoffle/search/namazu/conf/namazurc
-%dir %attr(750, wwwrun, root) /var/spool/wwwoffle
-%dir /var/spool/wwwoffle/html
-%doc /var/spool/wwwoffle/html/*
-%dir %attr(-, wwwrun, root) /var/spool/wwwoffle/http
-%dir %attr(-, wwwrun, root) /var/spool/wwwoffle/lasttime
-%dir %attr(-, wwwrun, root) /var/spool/wwwoffle/monitor
-%dir %attr(-, wwwrun, root) /var/spool/wwwoffle/outgoing
-%dir %attr(-, wwwrun, root) /var/spool/wwwoffle/prevtime1
+%dir %{_localstatedir}/spool/%{name}/search/namazu
+%dir %{_localstatedir}/spool/%{name}/search/namazu/conf/
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/namazu/conf/mknmzrc
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/namazu/conf/namazurc
+%dir %attr(750, wwwrun, root) %{_localstatedir}/spool/%{name}
+%dir %{_localstatedir}/spool/%{name}/html
+%doc %{_localstatedir}/spool/%{name}/html/*
+%dir %attr(-, wwwrun, root) %{_localstatedir}/spool/%{name}/http
+%dir %attr(-, wwwrun, root) %{_localstatedir}/spool/%{name}/lasttime
+%dir %attr(-, wwwrun, root) %{_localstatedir}/spool/%{name}/monitor
+%dir %attr(-, wwwrun, root) %{_localstatedir}/spool/%{name}/outgoing
+%dir %attr(-, wwwrun, root) %{_localstatedir}/spool/%{name}/prevtime1
# rest of htdig
-/var/spool/wwwoffle/search/htdig/db
-/var/spool/wwwoffle/search/htdig/tmp
-/var/spool/wwwoffle/search/htdig/scripts
-/var/spool/wwwoffle/search/htdig/db-lasttime
+%{_localstatedir}/spool/%{name}/search/htdig/db
+%{_localstatedir}/spool/%{name}/search/htdig/tmp
+%{_localstatedir}/spool/%{name}/search/htdig/scripts
+%{_localstatedir}/spool/%{name}/search/htdig/db-lasttime
# rest of mnogosearch
-/var/spool/wwwoffle/search/mnogosearch/db
-/var/spool/wwwoffle/search/mnogosearch/scripts
-/var/spool/wwwoffle/search/udmsearch
+%{_localstatedir}/spool/%{name}/search/mnogosearch/db
+%{_localstatedir}/spool/%{name}/search/mnogosearch/scripts
+%{_localstatedir}/spool/%{name}/search/udmsearch
# rest of namazu
-/var/spool/wwwoffle/search/namazu/db
-/var/spool/wwwoffle/search/namazu/scripts
+%{_localstatedir}/spool/%{name}/search/namazu/db
+%{_localstatedir}/spool/%{name}/search/namazu/scripts
# hyperestraier
-/var/spool/wwwoffle/search/hyperestraier
-%config(noreplace) /var/spool/wwwoffle/search/hyperestraier/conf/estseek.conf
-%_bindir/*
-%_sbindir/*
-/etc/ppp/ip-up.d/%name
-/etc/ppp/ip-down.d/%name
+%{_localstatedir}/spool/%{name}/search/hyperestraier
+%config(noreplace) %{_localstatedir}/spool/%{name}/search/hyperestraier/conf/estseek.conf
+%{_bindir}/*
+%{_sbindir}/*
+%{_sysconfdir}/ppp/ip-up.d/%{name}
+%{_sysconfdir}/ppp/ip-down.d/%{name}
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org