Hello community, here is the log from the commit of package netcfg for openSUSE:Factory checked in at 2014-06-18 10:59:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcfg (Old) and /work/SRC/openSUSE:Factory/.netcfg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcfg" Changes: -------- --- /work/SRC/openSUSE:Factory/netcfg/netcfg.changes 2014-02-08 10:34:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.netcfg.new/netcfg.changes 2014-06-18 10:59:33.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jun 11 08:47:56 UTC 2014 - [email protected] + +- move /etc/HOSTNAME to /etc/hostname during update + +------------------------------------------------------------------- +Wed Jun 4 10:36:22 UTC 2014 - [email protected] + +- HOSTNAME renamed to hostname [bnc#858908] + +------------------------------------------------------------------- Old: ---- HOSTNAME New: ---- hostname ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcfg.spec ++++++ --- /var/tmp/diff_new_pack.EGVZyx/_old 2014-06-18 10:59:34.000000000 +0200 +++ /var/tmp/diff_new_pack.EGVZyx/_new 2014-06-18 10:59:34.000000000 +0200 @@ -17,14 +17,11 @@ Name: netcfg -PreReq: coreutils aaa_base +Version: 11.5 +Release: 0 Summary: Network Configuration Files in /etc License: BSD-3-Clause Group: System/Base -Version: 11.5 -Release: 0 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: defaultdomain Source1: exports Source2: ftpusers @@ -37,7 +34,7 @@ Source9: networks Source10: protocols Source11: services.bz2 -Source12: HOSTNAME +Source12: hostname Source13: aliases Source14: ethers Source15: netgroup @@ -46,37 +43,56 @@ Source101: services-compare.sh Source102: services-create.pl Source103: services_UPDATING -Patch: services-suse.diff +Patch0: services-suse.diff +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: aaa_base +PreReq: coreutils +PreReq: permissions +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description All of the basic configuration files for the network programs including -/etc/aliases, /etc/protocols, and /etc/services. +%{_sysconfdir}/aliases, %{_sysconfdir}/protocols, and %{_sysconfdir}/services. These are often used by network routines in the C library and therefore must be installed for all network programs. - - %prep %build -cp %{S:16} . +cp %{SOURCE16} . %install -mkdir -p $RPM_BUILD_ROOT/etc -for i in HOSTNAME aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers; do - install $RPM_SOURCE_DIR/$i $RPM_BUILD_ROOT/etc +mkdir -p %{buildroot}/etc +for i in hostname aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers; do + install $RPM_SOURCE_DIR/$i %{buildroot}/etc done -bunzip2 $RPM_BUILD_ROOT/etc/services.bz2 -patch -p0 $RPM_BUILD_ROOT/etc/services < $RPM_SOURCE_DIR/services-suse.diff -rm -f $RPM_BUILD_ROOT/etc/services.orig +bunzip2 %{buildroot}%{_sysconfdir}/services.bz2 +patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff +rm -f %{buildroot}%{_sysconfdir}/services.orig +ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME %pre if [ "0$1" -ge "2" ]; then # If we have a /etc/netgroup.rpmsave and no /etc/netgroup, copy # /etc/netgroup.rpmsave and use it later instead of the new one. - if [ -f /etc/netgroup.rpmsave -a ! -e /etc/netgroup ]; then - cp /etc/netgroup.rpmsave /etc/...netgroup.new.rpmnew + if [ -f %{_sysconfdir}/netgroup.rpmsave -a ! -e %{_sysconfdir}/netgroup ]; then + cp %{_sysconfdir}/netgroup.rpmsave %{_sysconfdir}/...netgroup.new.rpmnew + fi +fi +#/etc/HOSTNAME renamed to /etc/hostname [bnc#858908] +#On Tue, Jun 10, 2014 at 03:23:00PM +0200, Frederic Crozat wrote: +#> So, it means netcfg should have a %pre which check if /etc/HOSTNAME is a +#> filename (and not a symlink) and in that case, rename the file +#> to /etc/hostname. This should ensure /etc/HOSTNAME is properly created +#> by RPM. +if [ "0$1" -ge "2" ]; then + if [ -f /etc/HOSTNAME -a ! -h /etc/HOSTNAME ]; then + if [ -f /etc/hostname ]; then + mv /etc/hostname /etc/hostname.rpmsave + fi + mv /etc/HOSTNAME /etc/hostname fi fi @@ -90,22 +106,23 @@ %files %defattr(644,root,root,755) -%verify(not md5 size mtime) %config(noreplace) /etc/HOSTNAME -%verify(not md5 size mtime) %config(noreplace) /etc/aliases -%verify(not md5 size mtime) %config(noreplace) /etc/defaultdomain -%verify(not md5 size mtime) %config(noreplace) /etc/ethers -%verify(not md5 size mtime) %config(noreplace) /etc/exports -%verify(not md5 size mtime) %config(noreplace) /etc/ftpusers -%config(noreplace) /etc/host.conf -%verify(not md5 size mtime) %config(noreplace) /etc/hosts -%verify(not md5 size mtime) %config(noreplace) /etc/hosts.allow -%verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny -%verify(not md5 size mtime) %config(noreplace) /etc/hosts.equiv -%verify(not md5 size mtime) %config(noreplace) /etc/hosts.lpd -%config(noreplace) /etc/netgroup -%config(noreplace) /etc/networks -%config(noreplace) /etc/protocols -%config(noreplace) /etc/services +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname +/etc/HOSTNAME +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ethers +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/exports +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ftpusers +%config(noreplace) %{_sysconfdir}/host.conf +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.allow +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.deny +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.equiv +%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.lpd +%config(noreplace) %{_sysconfdir}/netgroup +%config(noreplace) %{_sysconfdir}/networks +%config(noreplace) %{_sysconfdir}/protocols +%config(noreplace) %{_sysconfdir}/services %doc COPYING %changelog ++++++ hostname ++++++ linux.site -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
