Hello community, here is the log from the commit of package xfsprogs for openSUSE:Factory checked in at 2012-02-23 15:35:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsprogs (Old) and /work/SRC/openSUSE:Factory/.xfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfsprogs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfsprogs/xfsprogs.changes 2011-10-19 00:56:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfsprogs.new/xfsprogs.changes 2012-02-23 15:35:07.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 6 22:33:58 UTC 2012 - [email protected] + +- use %configure + +------------------------------------------------------------------- +Fri Feb 3 14:50:27 UTC 2012 - [email protected] + +- move libs and executables to /usr tree (UsrMerge project) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.hKEe9Q/_old 2012-02-23 15:35:08.000000000 +0100 +++ /var/tmp/diff_new_pack.hKEe9Q/_new 2012-02-23 15:35:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfsprogs # -# 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,22 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: xfsprogs BuildRequires: e2fsprogs-devel Version: 3.1.6 -Release: 1 +Release: 0 %if 0%{?suse_version} >= 1010 # hint for ZYPP Supplements: filesystem(xfs) %endif -AutoReqProv: on -Group: System/Filesystems -License: GPL-2.0+ Url: http://oss.sgi.com/projects/xfs/ Summary: Utilities for managing the XFS file system +License: GPL-2.0+ +Group: System/Filesystems Source0: xfsprogs-%{version}.tar.gz Patch0: xfsprogs-docdir.diff Patch1: xfsprogs-ppc64.diff @@ -58,11 +54,9 @@ %package devel Requires: xfsprogs = %version -AutoReqProv: on -Group: Development/Libraries/C and C++ -License: GPL-2.0+ Url: http://oss.sgi.com/projects/xfs/ Summary: XFS Filesystem-specific Static Libraries and Headers +Group: Development/Libraries/C and C++ %description devel xfsprogs-devel contains the libraries and header files needed to @@ -88,13 +82,7 @@ export DEBUG=-DNDEBUG export LIBUUID=/usr/%{_lib}/libuuid.a export CFLAGS="$RPM_OPT_FLAGS" -./configure \ - --prefix=%{_prefix} \ - --libdir=/%{_libdir} \ - --libexecdir=/usr/%{_lib} \ - --includedir=%{_includedir} \ - --mandir=%{_mandir} \ - --datadir=%{_datadir} +%configure --sbindir=%{_sbindir} --mandir=%{_mandir} --datadir=%{_datadir} make %{?jobs:-j %jobs} %install @@ -104,11 +92,18 @@ # remove devel stuff from /lib rm $RPM_BUILD_ROOT/%_lib/libhandle.{so,a,la} rm $RPM_BUILD_ROOT/%_libdir/libhandle.so +# move things to usr +mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir} +mv $RPM_BUILD_ROOT/%_lib/* $RPM_BUILD_ROOT%{_libdir} +#UsrMerge +ln -sf %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin +ln -sf %{_libdir}/libhandle.so.1 $RPM_BUILD_ROOT/%{_lib} +ln -sf %{_libdir}/libhandle.so.1.0.3 $RPM_BUILD_ROOT/%{_lib} +#EndUserMerge pushd $RPM_BUILD_ROOT%_libdir - ls ../../%_lib/libhandle.so.[0-9] - ln -s ../../%_lib/libhandle.so.[0-9] libhandle.so + ln -s libhandle.so.[0-9] libhandle.so popd -chmod 755 $RPM_BUILD_ROOT/sbin/fsck.xfs +chmod 755 $RPM_BUILD_ROOT/%_sbindir/fsck.xfs %find_lang %name %clean @@ -120,16 +115,19 @@ %files -f %name.lang %defattr(-,root,root,755) +#UsrMerge /sbin/* -/usr/sbin/* -# this is only used by xfs cmds, therefore no urgent need for a shlib package /%_lib/libhandle.so.* +#EndUsrMerge +%_sbindir/* +# this is only used by xfs cmds, therefore no urgent need for a shlib package +%_libdir/libhandle.so.* %doc /usr/share/man/man[58]/* %doc %_defaultdocdir/%name %files devel %defattr(-,root,root,755) -/usr/include/xfs +%_includedir/xfs %_libdir/*.so %_libdir/*.a %_libdir/*.la -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
