Hello community, here is the log from the commit of package htdig for openSUSE:Factory checked in at 2015-04-27 22:07:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/htdig (Old) and /work/SRC/openSUSE:Factory/.htdig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "htdig" Changes: -------- --- /work/SRC/openSUSE:Factory/htdig/htdig.changes 2011-10-16 12:50:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.htdig.new/htdig.changes 2015-04-27 22:07:24.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 21 12:44:10 UTC 2015 - mplus...@suse.com + +- Cleanup spec file with spec-cleaner +- Update dependencies +- Update category for devel package +- rename htdig-README.SuSE to htdig-README.SUSE + +------------------------------------------------------------------- Old: ---- htdig-README.SuSE New: ---- htdig-README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htdig.spec ++++++ --- /var/tmp/diff_new_pack.7G38s6/_old 2015-04-27 22:07:25.000000000 +0200 +++ /var/tmp/diff_new_pack.7G38s6/_new 2015-04-27 22:07:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package htdig # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs2 -q PREFIX) Name: htdig -BuildRequires: apache2-devel gcc-c++ libapr-util1-devel libopenssl-devel pcre-devel postfix zlib-devel -BuildRequires: libtool -%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX) -Url: http://www.htdig.org -License: GPL-2.0+ -Group: Productivity/Networking/Web/Utilities -AutoReqProv: on Version: 3.2.0b6 -Release: 217 +Release: 0 Summary: WWW Index and Search System +License: GPL-2.0+ +Group: Productivity/Networking/Web/Utilities +Url: http://www.htdig.org Source: http://switch.dl.sourceforge.net/sourceforge/htdig/htdig-%{version}.tar.bz2 -Source1: %{name}-README.SuSE +Source1: %{name}-README.SUSE Patch1: %{name}-google-style.patch Patch2: %{name}-rundig.patch Patch3: %{name}-ExternalParser-typo.patch @@ -43,6 +38,17 @@ Patch14: %{name}-quoting.patch # PATCH-FIX-UPSTREAM gmtime-lastday.patch use INT32_MAX to define last day (bnc##231196), related to (bnc#343913) Patch15: %{name}-gmtime-lastday.patch +BuildRequires: apache2-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libapr-util1-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool +BuildRequires: pcre-devel +BuildRequires: postfix +BuildRequires: rrdtool +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,18 +63,9 @@ span several Web servers at a site. The type of these Web servers does not matter as long as they understand the HTTP 1.0 protocol. - - -Authors: --------- - Andrew Scherpbier <and...@contigo.com> - Gabriele Bartolini <bartol...@infomedia.it> - Lachlan Andrew <l...@users.sourceforge.net> - %package devel -License: GPL-2.0+ Summary: Development files for htdig -Group: Productivity/Networking/Web/Utilities +Group: Development/Languages/C and C++ Requires: %{name} = %{version} %description devel @@ -82,16 +79,7 @@ This package is needed if you want to develop other applications on htdig. - - -Authors: --------- - Andrew Scherpbier <and...@contigo.com> - Gabriele Bartolini <bartol...@infomedia.it> - Lachlan Andrew <l...@users.sourceforge.net> - %package doc -License: GPL-2.0+ Summary: WWW Index and Search System Documentation Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} @@ -105,19 +93,11 @@ subsection of a Web site. This package provides additional documentation for htdig in -/usr/share/doc/packages/htdig/ - - - -Authors: --------- - Andrew Scherpbier <and...@contigo.com> - Gabriele Bartolini <bartol...@infomedia.it> - Lachlan Andrew <l...@users.sourceforge.net> +%{_docdir}/htdig/ %prep %setup -q -cp %{S:1} README.SuSE +cp %{SOURCE1} README.SUSE %patch1 %patch2 %patch3 @@ -133,14 +113,14 @@ %build %{?suse_update_config:%{suse_update_config -f db/dist}} pushd contrib 1>/dev/null -find . -type f | xargs -n 1 sed -i "s@/usr/local/bin/perl@/usr/bin/perl@" +find . -type f | xargs -n 1 sed -i "s@%{_prefix}/local/bin/perl@%{_bindir}/perl@" popd 1>/dev/null -%__rm -f acconfig.h db/dist/acconfig.h aclocal.m4 configure db/dist/configure +rm -f acconfig.h db/dist/acconfig.h aclocal.m4 configure db/dist/configure autoreconf --force --install %configure \ --with-config-dir=%{_sysconfdir}/htdig \ --with-common-dir=%{apache_serverroot}/htdig/common \ - --with-database-dir=/var/lib/htdig/db \ + --with-database-dir=%{_localstatedir}/lib/htdig/db \ --with-cgi-bin-dir=%{apache_serverroot}/cgi-bin \ --with-image-dir=%{apache_serverroot}/htdig/images \ --with-image-url-prefix=images \ @@ -149,64 +129,61 @@ --with-zlib \ --enable-bigfile \ --disable-static -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install find . -name \*.orig -o -name .cvsignore | xargs rm -f -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} # remove static libs as nobody uses them -find %buildroot/%_libdir/ -name *.*a | xargs rm -f -pushd %buildroot/%{_sysconfdir}/htdig 1>/dev/null +find %{buildroot}/%{_libdir}/ -name *.*a | xargs rm -f +pushd %{buildroot}/%{_sysconfdir}/htdig 1>/dev/null # try to use only one mime.types file (from aaa_base) for the distri -%__rm mime.types -%__ln_s ../mime.types mime.types +rm mime.types +ln -s ../mime.types mime.types # adapt the htdig.conf file sed -e "s@start_url:.*http://www.htdig.org/@start_url: http://localhost/@g"; htdig.conf > htdig.conf.new mv htdig.conf.new htdig.conf popd 1>/dev/null # install the documentation files in the right directory -%__mkdir_p %buildroot/%_defaultdocdir/%{name}/ +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ pushd %{_builddir}/%{name}-%{version} 1>/dev/null -cp -a contrib %buildroot/%_defaultdocdir/%{name}/ -cp -a htdoc %buildroot/%_defaultdocdir/%{name}/ -cp COPYING ChangeLog README* STATUS %buildroot/%_defaultdocdir/%{name}/ - -%clean -rm -rf %buildroot +cp -a contrib %{buildroot}/%{_defaultdocdir}/%{name}/ +cp -a htdoc %{buildroot}/%{_defaultdocdir}/%{name}/ +cp COPYING ChangeLog README* STATUS %{buildroot}/%{_defaultdocdir}/%{name}/ %files devel %defattr(-,root,root) -%dir %_includedir/htdig -%dir %_includedir/htdig_db -%_includedir/htdig/* -%_includedir/htdig_db/* +%dir %{_includedir}/htdig +%dir %{_includedir}/htdig_db +%{_includedir}/htdig/* +%{_includedir}/htdig_db/* %files doc %defattr(-,root,root) -%doc %_defaultdocdir/%{name}/contrib -%doc %_defaultdocdir/%{name}/htdoc +%doc %{_defaultdocdir}/%{name}/contrib +%doc %{_defaultdocdir}/%{name}/htdoc #disable execute permission -%attr(644, root, root) %_defaultdocdir/%{name}/htdoc/cf_generate.pl +%attr(644, root, root) %{_defaultdocdir}/%{name}/htdoc/cf_generate.pl #delete Makefile waste from doc -%exclude %_defaultdocdir/%{name}/htdoc/Makefile* +%exclude %{_defaultdocdir}/%{name}/htdoc/Makefile* %files %defattr(-,root,root) -%dir %_defaultdocdir/%{name} -%doc %_defaultdocdir/%{name}/* -%exclude %_defaultdocdir/%{name}/contrib -%exclude %_defaultdocdir/%{name}/htdoc +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/* +%exclude %{_defaultdocdir}/%{name}/contrib +%exclude %{_defaultdocdir}/%{name}/htdoc %config(noreplace) %{_sysconfdir}/htdig %dir %{apache_serverroot}/htdig %{apache_serverroot}/htdig/search.html %{apache_serverroot}/htdig/common %{apache_serverroot}/htdig/images -%dir /var/lib/htdig -/var/lib/htdig/db +%dir %{_localstatedir}/lib/htdig +%{_localstatedir}/lib/htdig/db %{apache_serverroot}/cgi-bin/htsearch %{apache_serverroot}/cgi-bin/qtest %{_mandir}/*/* -%_libdir/h* -%_bindir/* +%{_libdir}/h* +%{_bindir}/* %changelog ++++++ htdig-README.SUSE ++++++ Changes for htdig: ================== The htdig 'main' dir is now /srv/www/htdig, there is a subdir conf where the configuration file is to be found. /etc/htdig/htdig.conf is the htdig configuration file. Tools like htdig, htdump, etc. are installed in /usr/bin. The probably large databases go to /var/lib/htdig/db. The online documentation is in /usr/share/doc/packages/htdig if you install the htdig-doc package.
