Accepting request 103530 from Base:System

- place binary into /usr tree (UsrMerge project)

OBS-URL: https://build.opensuse.org/request/show/103530
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fillup?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2012-02-14 10:23:53 +00:00 committed by Git OBS Bridge
commit ceb9a60bc6
2 changed files with 17 additions and 6 deletions

View File

@ -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

View File

@ -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: GPL-2.0+
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