From 31de0989d8e1da162b0106425bd9d3872a2f25f2686f0b4213a62ff9f6b64bf0 Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Thu, 9 Feb 2012 07:43:10 +0000
Subject: [PATCH] Accepting request 103323 from
 home:rjschwei:branches:Base:System

usrMerge project - move files from toplevel to /usr

OBS-URL: https://build.opensuse.org/request/show/103323
OBS-URL: https://build.opensuse.org/package/show/Base:System/fillup?expand=0&rev=18
---
 fillup.changes |  5 +++++
 fillup.spec    | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/fillup.changes b/fillup.changes
index 909ded8..5573afd 100644
--- a/fillup.changes
+++ b/fillup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb  8 13:08:55 UTC 2012 - rschweikert@suse.com
+
+- place binary into /usr tree (UsrMerge project)
+
 -------------------------------------------------------------------
 Fri Sep 30 15:00:41 UTC 2011 - uli@suse.com
 
diff --git a/fillup.spec b/fillup.spec
index 3675e5b..29d881d 100644
--- a/fillup.spec
+++ b/fillup.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fillup
 #
-# 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
@@ -16,14 +16,13 @@
 #
 
 
-
 Name:           fillup
-License:        GPLv2+
-Group:          System/Base
 Provides:       aaa_base:/bin/fillup
 Version:        1.42
-Release:        257
+Release:        0
 Summary:        Tool for Merging Config Files
+License:        GPL-2.0+
+Group:          System/Base
 Source:         fillup-%{version}.tar.bz2
 Patch:          fillup-optflags.patch
 Patch1:         fillup-warnings.dif
@@ -76,14 +75,21 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 #
 # install fillup
 #
+install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
+install -m 755 BIN/fillup $RPM_BUILD_ROOT/%{_bindir}
+#UsrMerge
 install -d -m 755 $RPM_BUILD_ROOT/bin
-install -m 755 BIN/fillup $RPM_BUILD_ROOT/bin
+ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin
+#EndUserMerge
 install -d $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
 
 %files
 %defattr(-,root,root)
+#UsrMerge
 /bin/fillup
+#EndUserMerge
+%{_bindir}/fillup
 %{_mandir}/man8/fillup*
 
 %changelog