rpms/fakeroot/EL-5 .cvsignore, 1.4, 1.5 fakeroot.spec, 1.3, 1.4 sources, 1.4, 1.5

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/fakeroot/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5512

Modified Files:
	.cvsignore fakeroot.spec sources 
Log Message:
Backport newest fakeroot 1.12.2 from Rawhide.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fakeroot/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	8 Mar 2007 18:34:28 -0000	1.4
+++ .cvsignore	11 May 2009 15:55:15 -0000	1.5
@@ -1,3 +1 @@
-fakeroot_1.5.10.tar.gz
-fakeroot-1.6.4-atfuncs.patch
-fakeroot_1.6.4.tar.gz
+fakeroot_1.12.2.tar.gz


Index: fakeroot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fakeroot/EL-5/fakeroot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- fakeroot.spec	6 May 2007 18:48:15 -0000	1.3
+++ fakeroot.spec	11 May 2009 15:55:15 -0000	1.4
@@ -1,12 +1,12 @@
 Summary: Gives a fake root environment
 Name: fakeroot
-Version: 1.6.4
-Release: 15%{?dist}.1
-License: GPL
+Version: 1.12.2
+Release: 21%{?dist}
+License: GPL+
 Group: Development/Tools
 URL: http://fakeroot.alioth.debian.org/
 Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.tar.gz
-Patch0: fakeroot-1.6.4-atfuncs.patch
+#Patch0: fakeroot-1.6.4-atfuncs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: gcc-c++
 BuildRequires: /usr/bin/getopt
@@ -14,6 +14,7 @@ BuildRequires: /usr/bin/getopt
 #BuildRequires: po4a
 BuildRequires: sharutils
 Requires: /usr/bin/getopt
+Requires: fakeroot-libs = %{version}-%{release}
 
 %description
 fakeroot runs a command in an environment wherein it appears to have
@@ -22,27 +23,59 @@ file manipulation library functions (chm
 that simulate the effect the real library functions would have had,
 had the user really been root.
 
+%package libs
+Summary: Gives a fake root environment (libraries)
+Group: Development/Tools
+
+%description libs
+This package contains the libraries required by %{name}.
+
 %prep
 %setup -q
-%patch0 -p1 -b .atfixes
+#patch0 -p1 -b .atfixes
 for file in ./doc/*/*.1; do
   iconv -f latin1 -t utf8 < $file > $file.new
   mv -f $file.new $file
 done
 
 %build
+for type in sysv tcp; do
+mkdir obj-$type
+cd obj-$type
+cat >> configure << 'EOF'
+#! /bin/sh
+exec ../configure "$@"
+EOF
+chmod +x configure
 %configure \
   --disable-dependency-tracking \
   --disable-static \
-  --libdir=%{_libdir}/libfakeroot
+  --libdir=%{_libdir}/libfakeroot \
+  --with-ipc=$type \
+  --program-suffix=-$type
 make
+cd ..
+done
 
 %install
 rm -rf %{buildroot}
-make install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot}
+for type in sysv tcp; do
+  make -C obj-$type install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot}
+  chmod 644 %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so 
+  mv %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so \
+     %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so
+  rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so
+  rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*a*
+done
 
-%check || :
-make check
+ln -s faked-tcp %{buildroot}%{_bindir}/faked
+ln -s fakeroot-tcp %{buildroot}%{_bindir}/fakeroot
+ln -s libfakeroot-tcp.so %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so
+
+%check
+for type in sysv tcp; do
+  make -C obj-$type check
+done
 
 %clean
 rm -rf %{buildroot}
@@ -50,24 +83,30 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING AUTHORS BUGS DEBUG doc/README.saving debian/changelog
+%{_bindir}/faked-*
 %{_bindir}/faked
+%{_bindir}/fakeroot-*
 %{_bindir}/fakeroot
-%{_mandir}/man1/faked.1.gz
-%{_mandir}/man1/fakeroot.1.gz
-%lang(es) %{_mandir}/es/man1/faked.1.gz
-%lang(es) %{_mandir}/es/man1/fakeroot.1.gz
-%lang(fr) %{_mandir}/fr/man1/faked.1.gz
-%lang(fr) %{_mandir}/fr/man1/fakeroot.1.gz
-%lang(sv) %{_mandir}/sv/man1/faked.1.gz
-%lang(sv) %{_mandir}/sv/man1/fakeroot.1.gz
-%lang(nl) %{_mandir}/nl/man1/faked.1.gz
-%lang(nl) %{_mandir}/nl/man1/fakeroot.1.gz
+%{_mandir}/man1/faked-*.1*
+%{_mandir}/man1/fakeroot-*.1*
+%lang(es) %{_mandir}/es/man1/faked-*.1*
+%lang(es) %{_mandir}/es/man1/fakeroot-*.1*
+%lang(fr) %{_mandir}/fr/man1/faked-*.1*
+%lang(fr) %{_mandir}/fr/man1/fakeroot-*.1*
+%lang(sv) %{_mandir}/sv/man1/faked-*.1*
+%lang(sv) %{_mandir}/sv/man1/fakeroot-*.1*
+%lang(nl) %{_mandir}/nl/man1/faked-*.1*
+%lang(nl) %{_mandir}/nl/man1/fakeroot-*.1*
+
+%files libs
 %dir %{_libdir}/libfakeroot
+%{_libdir}/libfakeroot/libfakeroot-*.so
 %{_libdir}/libfakeroot/libfakeroot-0.so
-%{_libdir}/libfakeroot/libfakeroot.so
-%exclude %{_libdir}/libfakeroot/libfakeroot.la
 
 %changelog
+* Mon May 11 2009 Richard W.M. Jones <rjones at redhat.com> - 2.9-22
+- Backport newest fakeroot 1.12.2 from Rawhide.
+
 * Sun May 06 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
 - rebuilt for RHEL5 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fakeroot/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	8 Mar 2007 18:34:28 -0000	1.4
+++ sources	11 May 2009 15:55:15 -0000	1.5
@@ -1,3 +1 @@
-76730bf4c9068773e857e18c346d8c81  fakeroot_1.5.10.tar.gz
-54d232ba149510edb70ab2f64c07b493  fakeroot-1.6.4-atfuncs.patch
-edfc56b315c8ccfba4049d4158db38dc  fakeroot_1.6.4.tar.gz
+1eb7d972a19159035892e7d132602726  fakeroot_1.12.2.tar.gz