Hello community,

here is the log from the commit of package yp-tools for openSUSE:Factory 
checked in at 2012-02-20 16:20:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yp-tools (Old)
 and      /work/SRC/openSUSE:Factory/.yp-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yp-tools", Maintainer is "ku...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yp-tools/yp-tools.changes        2011-09-23 
12:53:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yp-tools.new/yp-tools.changes   2012-02-20 
16:20:24.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Feb  4 13:24:10 UTC 2012 - rschweik...@suse.com
+
+- keep all binaries in /usr (UsrMerge project)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yp-tools.spec ++++++
--- /var/tmp/diff_new_pack.3Cl7IX/_old  2012-02-20 16:20:25.000000000 +0100
+++ /var/tmp/diff_new_pack.3Cl7IX/_new  2012-02-20 16:20:25.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package yp-tools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,18 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           yp-tools
-License:        GPL-2.0
-Group:          Productivity/Networking/NIS
 Provides:       ypclient:/usr/bin/ypwhich
-AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        2.12
-Release:        7
+Release:        0
 Summary:        Network Information Service (YP) client utilities
+License:        GPL-2.0
+Group:          Productivity/Networking/NIS
 Source:         yp-tools-%{version}.tar.bz2
 Source1:        match_printcap
 
@@ -56,8 +53,11 @@
 mkdir -p $RPM_BUILD_ROOT/usr/lib/yp
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/yp
 rm $RPM_BUILD_ROOT%{_bindir}/domainname 
$RPM_BUILD_ROOT/usr/share/man/man8/domainname.8
+#UsrMerge
 mkdir -p $RPM_BUILD_ROOT/bin
-mv -v $RPM_BUILD_ROOT%{_bindir}/{nis,yp}domainname $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/nisdomainname $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/ypdomainname $RPM_BUILD_ROOT/bin
+#EndUsrMerge
 %{find_lang} %{name}
 
 %clean
@@ -68,14 +68,18 @@
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %dir /var/yp
 %config(noreplace) /var/yp/nicknames
-/bin/ypdomainname
+#UsrMerge
 /bin/nisdomainname
-/usr/bin/ypcat
-/usr/bin/ypchfn
-/usr/bin/ypchsh
-/usr/bin/ypmatch
-/usr/bin/yppasswd
-/usr/bin/ypwhich
+/bin/ypdomainname
+#EndUsrMerge
+%_bindir/nisdomainname
+%_bindir/ypcat
+%_bindir/ypchfn
+%_bindir/ypchsh
+%_bindir/ypdomainname
+%_bindir/ypmatch
+%_bindir/yppasswd
+%_bindir/ypwhich
 %dir /usr/lib/yp
 /usr/lib/yp/match_printcap
 %doc %{_mandir}/man1/ypcat.1.gz
@@ -90,8 +94,8 @@
 %doc %{_mandir}/man8/yptest.8.gz
 %doc %{_mandir}/man8/ypdomainname.8.gz
 %doc %{_mandir}/man8/nisdomainname.8.gz
-/usr/sbin/yppoll
-/usr/sbin/ypset
-/usr/sbin/yptest
+%_sbindir/yppoll
+%_sbindir/ypset
+%_sbindir/yptest
 
 %changelog

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to