Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2012-09-10 15:20:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glibc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2012-08-31 09:27:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc.changes 2012-09-10 15:20:23.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 4 11:08:53 UTC 2012 - [email protected] + +- Move pt_chown to %{_libexecdir} so that baselibs can find it. +- Do create hardlinks to getconf so that baselibs use the correct binary + and getconf -v works (obsoletes patch glibc-2.8-getconf.diff). + +------------------------------------------------------------------- Old: ---- glibc-2.8-getconf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.7gXq1F/_old 2012-09-10 15:20:27.000000000 +0200 +++ /var/tmp/diff_new_pack.7gXq1F/_new 2012-09-10 15:20:27.000000000 +0200 @@ -201,8 +201,6 @@ Patch14: glibc-2.3.90-bindresvport.blacklist.diff # PATCH-FIX-OPENSUSE prefer -lang rpm packages Patch15: glibc-2.3.90-langpackdir.diff -# PATCH-FIX-OPENSUSE Do not generate hardlink for getconf -Patch16: glibc-2.8-getconf.diff # PATCH-FIX-OPENSUSE add option --enable-runbinaries to disable running of compiled binaries Patch17: glibc-compiled-binaries.diff # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility [email protected] (XXX: Review) @@ -472,7 +470,6 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %patch17 -p1 %patch18 -p1 %patch21 -p1 @@ -648,7 +645,7 @@ CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \ CC="$BuildCC" CXX="$BuildCCplus" ../configure \ --prefix=%{_prefix} \ - --libexecdir=%{_libdir} --infodir=%{_infodir} \ + --libexecdir=%{_libexecdir} --infodir=%{_infodir} \ --enable-add-ons=nptl$addons \ $profile \ "$@" \ @@ -984,6 +981,10 @@ ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3 %endif +# Move getconf to %{_libexecdir}/getconf/ to avoid cross device link +mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf +ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf + ####################################################################### ### ### ... @@ -991,19 +992,19 @@ ####################################################################### # Note: glibc_post_upgrade does: -# %%set_permissions %%{_libdir}/pt_chown +# %%set_permissions %%{_libexecdir}/pt_chown # since we cannot do it in our own post section %post -p %{_sbindir}/glibc_post_upgrade # Enabling the following lines will generate a # requires on /bin/sh but glibc should not require any other binary -# packages. Therefore we do the change with the build-in lua: -# %verifyscript -# %verify_permissions -e %{_libdir}/pt_chown +# packages. Therefore we do the change with the built-in lua: +# %%verifyscript +# %%verify_permissions -e %%{_libexecdir}/pt_chown %verifyscript -p <lua> -os.execute("/usr/bin/chkstat -n --warn --system -e %{_libdir}/pt_chown") +os.execute("/usr/bin/chkstat -n --warn --system -e %{_libexecdir}/pt_chown") %postun -p /sbin/ldconfig @@ -1181,9 +1182,9 @@ %endif %{_bindir}/locale %{_bindir}/localedef -%verify(not mode caps) %attr(4755,root,root) %{_libdir}/pt_chown -%dir %attr(0755,root,root) %{_libdir}/getconf -%{_libdir}/getconf/* +%verify(not mode caps) %attr(4755,root,root) %{_libexecdir}/pt_chown +%dir %attr(0755,root,root) %{_libexecdir}/getconf +%{_libexecdir}/getconf/* %{_sbindir}/glibc_post_upgrade %{_sbindir}/iconvconfig ++++++ glibc_post_upgrade.c ++++++ --- /var/tmp/diff_new_pack.7gXq1F/_old 2012-09-10 15:20:27.000000000 +0200 +++ /var/tmp/diff_new_pack.7gXq1F/_new 2012-09-10 15:20:27.000000000 +0200 @@ -128,11 +128,10 @@ "--nostdlib", GCONV_MODULES_DIR); } - /* Implement %set_permissions %{_libdir}/pt_chown. */ + /* Implement %set_permissions %{_libexecdir}/pt_chown. */ if (access ("/usr/bin/chkstat", X_OK) == 0) verbose_exec (114, 1, "/usr/bin/chkstat", "/usr/bin/chkstat", - "-n", "--set", "--system", "/usr/lib/pt_chown", - "/usr/lib64/pt_chown"); + "-n", "--set", "--system", "/usr/lib/pt_chown"); /* Check if telinit is available and the init fifo as well. */ if (access ("/sbin/telinit", X_OK) || access ("/dev/initctl", F_OK)) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
