Hello community, here is the log from the commit of package scrollkeeper for openSUSE:Factory checked in at Fri Jun 12 17:26:48 CEST 2009. -------- --- GNOME/scrollkeeper/scrollkeeper.changes 2009-01-31 21:58:04.000000000 +0100 +++ scrollkeeper/scrollkeeper.changes 2009-05-28 18:14:52.000000000 +0200 @@ -1,0 +2,14 @@ +Thu May 28 18:12:51 CEST 2009 - vuntz@novell.com + +- Use update-alternatives for the binaries, and rename all of them + by default so that rarian-scrollkeeper-compat can be installed at + the same time. +- Suggests logrotate. +- Rename no to nb locale after installation, so we don't have to + call autoreconf. +- Remove obsolete checks for old versions of openSUSE. +- Use configure macro. +- Use makeinstall. +- Remove commented out commands. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scrollkeeper.spec ++++++ --- /var/tmp/diff_new_pack.FZ9168/_old 2009-06-12 17:24:40.000000000 +0200 +++ /var/tmp/diff_new_pack.FZ9168/_new 2009-06-12 17:24:40.000000000 +0200 @@ -24,7 +24,7 @@ %define my_localstatedir /var Summary: Cataloging System for Documentation Version: 0.3.14 -Release: 251 +Release: 252 Source0: scrollkeeper-%{version}.tar.bz2 Source1: logrotate.%{name} # PATCH-FIX-OPENSUSE scrollkeeper-0.3.14-rebuilddb.diff bnc96609 ke@suse.de @@ -40,6 +40,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://scrollkeeper.sourceforge.net/ PreReq: /bin/touch sgml-skel /usr/bin/xmlcatalog libxml2 docbook_4 libxslt +Requires(post): update-alternatives +Requires(postun): update-alternatives +# The build service fails to build the package because it doesn't really +# understand Requires(post), so use PreReq too (see bnc#439232). +%if %defined suse_version +PreReq: update-alternatives +%endif +Suggests: logrotate %description ScrollKeeper is a cataloging system for documentation. It manages @@ -59,43 +67,17 @@ Gregory Leblanc <gleblanc@cu-portland.edu> Laszlo Kovacs <laszlo.kovacs@sun.com> -%define INSTALL install -m755 -s -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 -%define INSTALL_SCRIPT install -m755 %lang_package - %prep %setup -q -#%setup -q -a 1 %patch -p1 -b .rebuilddb %patch1 %build -rename no nb po/no.* -sed "s/(ALL_LINGUAS.*) no /\1 nb /" configure.in > configure.in.tmp && \ - mv configure.in.tmp configure.in -%{?suse_update_config:%{suse_update_config}} -libtoolize --copy --force -intltoolize --copy --force -aclocal -autoconf -%if %suse_version < 910 -for f in /etc/xml/for-catalog-*; do - cp /etc/xml/catalog /etc/xml/catalog.susebuild - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add $f -done -%endif -CFLAGS=$RPM_OPT_FLAGS \ - ./configure \ +%configure \ --localstatedir=%{my_localstatedir} \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ --with-omfdirs=/usr/share/omf:/usr/local/share/omf -make +%{__make} %{?jobs:-j%jobs} xmlcatbin=/usr/bin/xmlcatalog CATALOG=scrollkeeper.xml $xmlcatbin --noout --create $CATALOG @@ -123,8 +105,7 @@ %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} %install -if [ ! $RPM_BUILD_ROOT = "/" ]; then rm -rf $RPM_BUILD_ROOT; fi -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall # scrollkeepr does not export headers or a .pc, # so it can't be used outside of scrollkeeper rm $RPM_BUILD_ROOT%{_prefix}/%_lib/libscrollkeeper.*a @@ -136,99 +117,50 @@ # # Change sr@Latn to sr@latin mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin +# Change no to nb +mv %{buildroot}%{_datadir}/locale/no %{buildroot}%{_datadir}/locale/nb %find_lang %{name} +# Logrotate install -d $RPM_BUILD_ROOT/etc/logrotate.d install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} -/sbin/ldconfig -n $RPM_BUILD_ROOT%_libdir -### cat <<'EOF' >SuSEconfig.%{name} -### #! /bin/sh -### # Copyright (c) 2002, 2004, 2005 SuSE Linux AG Nuremberg, Germany. -### # All rights reserved. -### # -### # Authors: Karl Eichwalder <ke@suse.de>, 2002, 2005 -### # Holger Hetterich <hhetter@suse.de>, 2002 -### # check if we are started as root -### # only one of UID and USER must be set correctly -### export LC_ALL= -### export LANGUAGE= -### if test "$UID" != 0 -a "$USER" != root; then -### echo "You must be root to start $0." -### exit 1 -### fi -### # -### # SuSEconfig sometimes sets the variable CHECK_NEWPACKAGE. If it is set -### # to false, we don't have to do anything. -### # -### test "$CHECK_NEWPACKAGE" = false && exit 0 -### # -### test -n "$ROOT" && exit 0 -### xmlcatbin=/usr/bin/xmlcatalog -### : ${localstated_r:=/var} -### [ -x $r/$xmlcatbin ] || exit 0 -### [ -f /etc/xml/catalog ] || exit 0 -### if $xmlcatbin /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" \ -### | grep "No entry" >/dev/null; then -### exit 0 -### fi -### if [ -f /var/adm/SuSEconfig/run-scrollkeeper-update ]; then -### scrollkeeper-update \ -### && rm -f /var/adm/SuSEconfig/run-scrollkeeper-update -### fi -### # scrollkeeper-rebuilddb -q -p $localstated_r/lib/scrollkeeper || true -### rm -f /var/adm/SuSEconfig/run-%{name}-update -### exit 0 -### EOF -### # -### %{INSTALL_DIR} %{buildroot}/sbin/conf.d -### %{INSTALL_SCRIPT} SuSEconfig.%{name} \ -### %{buildroot}/sbin/conf.d/SuSEconfig.%{name} -### # %{INSTALL_DIR} %{buildroot}/var/adm/SuSEconfig -### # touch %{buildroot}/var/adm/SuSEconfig/run-%{name} +# xml catalog cat_dir=%{buildroot}/etc/xml -%{INSTALL_DIR} $cat_dir -# %{INSTALL_DATA} %{name}.xml $RPM_BUILD_ROOT/etc/xml/%{name}.xml -%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir +install -d -m755 $cat_dir +# install -m644 %{name}.xml $RPM_BUILD_ROOT/etc/xml/%{name}.xml +install -m644 %{FOR_ROOT_CAT} %{name}.xml $cat_dir +for binary in %{buildroot}/%{_bindir}/*; do + mv $binary $binary.sk +done %fdupes $RPM_BUILD_ROOT %clean -%if %suse_version < 910 -[ -f /etc/xml/catalog.susebuild ] \ - && mv /etc/xml/catalog.susebuild /etc/xml/catalog -%endif rm -rf $RPM_BUILD_ROOT # %pre # # rm -rf %{_datadir}/scrollkeeper/Templates || true %post /sbin/ldconfig -# touching run-%{name}-update is probably superfluous; check after 9.0 -# touch var/adm/SuSEconfig/run-%{name}-update localstated_r=$(echo %{my_localstatedir}|sed 's:^/::') # rm -rf /var/lib/scrollkeeper # mkdir -p var/lib/scrollkeeper # scrollkeeper-update -p var/lib/scrollkeeper edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{FOR_ROOT_CAT} -### On SL, yelp does not make use of the SK system -### if [ $1 = 2 ]; then -### # Upgrading -### echo "$(date +"%b %d %X") Upgrading to ScrollKeeper $(scrollkeeper-config --version)..." \ -### >> $localstated_r/log/scrollkeeper.log -### fi -### if [ $1 = 1 ]; then -### # Installing -### echo "$(date +"%b %d %X") Installing ScrollKeeper $(scrollkeeper-config --version)..." \ -### >> $localstated_r/log/scrollkeeper.log -### scrollkeeper-rebuilddb -q -p %{_localstatedir}/lib/scrollkeeper || true -### exit 0 -### fi -# # Only run the update script after package installation via SuSEconfig -# # or if the user installs it directly with rpm. -# # echo "$YAST_IS_RUNNING" -# [ -z "$YAST_IS_RUNNING" ] || exit 0 -# if [ -x sbin/conf.d/SuSEconfig.%{name} ]; then -# sbin/conf.d/SuSEconfig.%{name} -# fi +update-alternatives \ + --install %{_bindir}/scrollkeeper-config scrollkeeper-config %{_bindir}/scrollkeeper-config.sk 20 \ + --slave %{_bindir}/scrollkeeper-extract scrollkeeper-extract %{_bindir}/scrollkeeper-extract.sk \ + --slave %{_bindir}/scrollkeeper-gen-seriesid scrollkeeper-gen-seriesid %{_bindir}/scrollkeeper-gen-seriesid.sk \ + --slave %{_bindir}/scrollkeeper-get-cl scrollkeeper-get-cl %{_bindir}/scrollkeeper-get-cl.sk \ + --slave %{_bindir}/scrollkeeper-get-content-list scrollkeeper-get-content-list %{_bindir}/scrollkeeper-get-content-list.sk \ + --slave %{_bindir}/scrollkeeper-get-extended-content-list scrollkeeper-get-extended-content-list %{_bindir}/scrollkeeper-get-extended-content-list.sk \ + --slave %{_bindir}/scrollkeeper-get-index-from-docpath scrollkeeper-get-index-from-docpath %{_bindir}/scrollkeeper-get-index-from-docpath.sk \ + --slave %{_bindir}/scrollkeeper-get-toc-from-docpath scrollkeeper-get-toc-from-docpath %{_bindir}/scrollkeeper-get-toc-from-docpath.sk \ + --slave %{_bindir}/scrollkeeper-get-toc-from-id scrollkeeper-get-toc-from-id %{_bindir}/scrollkeeper-get-toc-from-id.sk \ + --slave %{_bindir}/scrollkeeper-install scrollkeeper-install %{_bindir}/scrollkeeper-install.sk \ + --slave %{_bindir}/scrollkeeper-preinstall scrollkeeper-preinstall %{_bindir}/scrollkeeper-preinstall.sk \ + --slave %{_bindir}/scrollkeeper-rebuilddb scrollkeeper-rebuilddb %{_bindir}/scrollkeeper-rebuilddb.sk \ + --slave %{_bindir}/scrollkeeper-uninstall scrollkeeper-uninstall %{_bindir}/scrollkeeper-uninstall.sk \ + --slave %{_bindir}/scrollkeeper-update scrollkeeper-update %{_bindir}/scrollkeeper-update.sk %postun localstated_r=$(echo %{my_localstatedir}|sed 's:^/::') @@ -248,7 +180,7 @@ ### fi #rm -rf %{_datadir}/scrollkeeper/templates /sbin/ldconfig -exit 0 +update-alternatives --remove scrollkeeper-config %{_bindir}/scrollkeeper-config.sk %files %defattr(-,root,root) @@ -256,18 +188,27 @@ %config(noreplace) /etc/logrotate.d/%{name} %config %{_sysconfdir}/%{name}.conf %config %{_sysconfdir}/xml -### /sbin/conf.d/SuSEconfig.%{name} %{_datadir}/omf -%{_bindir}/* +%{_bindir}/*.sk %{_libdir}/lib* %{_mandir}/*/* %{_datadir}/xml/scrollkeeper %{_datadir}/scrollkeeper -# %{_datadir}/locale/*/* %files lang -f %{name}.lang %changelog +* Thu May 28 2009 vuntz@novell.com +- Use update-alternatives for the binaries, and rename all of them + by default so that rarian-scrollkeeper-compat can be installed at + the same time. +- Suggests logrotate. +- Rename no to nb locale after installation, so we don't have to + call autoreconf. +- Remove obsolete checks for old versions of openSUSE. +- Use configure macro. +- Use makeinstall. +- Remove commented out commands. * Sat Jan 31 2009 vuntz@novell.com - Use sr@latin instead of sr@Latn. * Fri Jul 18 2008 jpr@novell.com @@ -301,7 +242,7 @@ - fixed file list * Mon Nov 08 2004 ro@suse.de - fix last change -* Mon Oct 18 2004 ro@suse.de +* Tue Oct 19 2004 ro@suse.de - locale rename: no -> nb * Fri Feb 13 2004 ke@suse.de - Stop touching /var/adm/SuSEconfig/run-scrollkeeper-update; run ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org