Hello community, here is the log from the commit of package mlocate for openSUSE:Factory checked in at 2014-03-14 15:16:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mlocate (Old) and /work/SRC/openSUSE:Factory/.mlocate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mlocate" Changes: -------- --- /work/SRC/openSUSE:Factory/mlocate/mlocate.changes 2013-10-31 16:04:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mlocate.new/mlocate.changes 2014-03-14 15:16:54.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Mar 14 08:24:29 UTC 2014 - [email protected] + +- Include findutils-locate variables in updatedb.conf if user + still have them specified. bnc#861955 + * This ensures we can still load the variables user can specified + in the /etc/sysconfig/locate namely UPDATEDB_PRUNEPATHS and + UPDATEDB_PRUNEFS + +------------------------------------------------------------------- +Fri Mar 14 08:18:22 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner. + +------------------------------------------------------------------- +Fri Mar 14 08:17:01 UTC 2014 - [email protected] + +- Update comments in sysconfig.locate a bit to reflect reality. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mlocate.spec ++++++ --- /var/tmp/diff_new_pack.WW9ZTF/_old 2014-03-14 15:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.WW9ZTF/_new 2014-03-14 15:16:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mlocate # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,27 +23,27 @@ License: GPL-2.0 Group: System/Monitoring Url: https://fedorahosted.org/mlocate/ -Source0: https://fedorahosted.org/releases/m/l/%name/%name-%version.tar.xz +Source0: https://fedorahosted.org/releases/m/l/%{name}/%{name}-%{version}.tar.xz Source1: updatedb.conf -Source2: %name.cron +Source2: %{name}.cron Source3: sysconfig.locate -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-tools BuildRequires: grep BuildRequires: sed BuildRequires: xz +Requires: cron +Requires(post): %fillup_prereq Requires(pre): permissions Requires(pre): pwdutils -Requires(post): %{fillup_prereq} -Requires: cron -Provides: findutils:/usr/bin/locate +Recommends: %{name}-lang = %{version} +Provides: findutils:%{_bindir}/locate # findutils is at version 4.5 so we need newer # provides here to get it really obsoleted Provides: findutils-locate = 5.%{version} Obsoletes: findutils-locate < 5.%{version} -Recommends: %{name}-lang = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A new locate implementation. The m character @@ -65,29 +65,28 @@ src/conf.c %build -export CFLAGS="%optflags -fPIE" +export CFLAGS="%{optflags} -fPIE" export LDFLAGS="-pie" %configure \ - --localstatedir=%_localstatedir/lib \ + --localstatedir=%{_localstatedir}/lib \ --enable-nls \ --disable-rpath -make groupname=nobody +make groupname=nobody %{?_smp_mflags} %install -rm -rf %buildroot -make DESTDIR=%buildroot groupname=nobody install -%find_lang %name || echo -n >> %name.lang +make DESTDIR=%{buildroot} groupname=nobody install +%find_lang %{name} || echo -n >> %{name}.lang # DB file -mkdir -p %buildroot%_localstatedir/lib/%name -echo -n >> %buildroot%_localstatedir/lib/%name/%name.db +mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} +echo -n >> %{buildroot}%{_localstatedir}/lib/%{name}/%{name}.db # Config -mkdir -p %buildroot%_sysconfdir -install -p -m 644 %SOURCE1 %buildroot%_sysconfdir +mkdir -p %{buildroot}%{_sysconfdir} +install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir} # Cron -mkdir -p %buildroot%_sysconfdir/cron.daily -install -p -m 755 %SOURCE2 %buildroot%_sysconfdir/cron.daily +mkdir -p %{buildroot}%{_sysconfdir}/cron.daily +install -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily # Sysconfig settings -install -D -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates/sysconfig.locate +install -D -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.locate %post %{fillup_only -n locate} @@ -95,16 +94,16 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog README NEWS COPYING -%config(noreplace) %_sysconfdir/updatedb.conf -%_sysconfdir/cron.daily/%name.cron -%attr(0755,root,root) %_bindir/locate -%_bindir/updatedb -%_mandir/man*/* -%dir %_localstatedir/lib/mlocate -%ghost %_localstatedir/lib/mlocate/mlocate.db -/var/adm/fillup-templates/* +%config(noreplace) %{_sysconfdir}/updatedb.conf +%{_sysconfdir}/cron.daily/%{name}.cron +%attr(0755,root,root) %{_bindir}/locate +%{_bindir}/updatedb +%{_mandir}/man*/* +%dir %{_localstatedir}/lib/mlocate +%ghost %{_localstatedir}/lib/mlocate/mlocate.db +%{_localstatedir}/adm/fillup-templates/* -%files lang -f %name.lang +%files lang -f %{name}.lang %defattr(-,root,root,-) %changelog ++++++ sysconfig.locate ++++++ --- /var/tmp/diff_new_pack.WW9ZTF/_old 2014-03-14 15:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.WW9ZTF/_new 2014-03-14 15:16:54.000000000 +0100 @@ -14,7 +14,7 @@ ## Type: string(nobody, root, ...) ## Default: nobody # -# updatedb has a parameter "--localuser". +# updatedb can be run under specified user privileges # It runs the "find" command as this user. Some people think this is a # security hole if set to 'root' (because some directory information can # be read which is normally protected). Others think it is useful to hold @@ -27,15 +27,17 @@ ## Type: integer ## Default: 19 # nice value to run at: see -n in nice(1) +# NICE="19" ## Type: integer ## Default: 2 # ionice class to run at: see -c in ionice(1) -# you have to install sys-apps/util-linux manually +# IONICE_CLASS="2" ## Type: integer ## Default: 7 # ionice priority to run at: see -n in ionice(1) +# IONICE_PRIORITY="7" ++++++ updatedb.conf ++++++ --- /var/tmp/diff_new_pack.WW9ZTF/_old 2014-03-14 15:16:54.000000000 +0100 +++ /var/tmp/diff_new_pack.WW9ZTF/_new 2014-03-14 15:16:54.000000000 +0100 @@ -14,3 +14,15 @@ # Skip bind mounts. PRUNE_BIND_MOUNTS="yes" + +# Compat code for including variables from findutils-locate +# where the values were store in /etc/sysconfig/locate +if [ -f /etc/sysconfig/locate ] ; then + . /etc/sysconfig/locate + if [ -n ${UPDATEDB_PRUNEFS} ] ; then + PRUNEFS="${PRUNEFS} ${UPDATEDB_PRUNEFS}" + fi + if [ -n ${UPDATEDB_PRUNEPATHS ] ; then + PRUNEPATHS="${PRUNEPATHS} ${UPDATEDB_PRUNEPATHS}" + fi +fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
