packages: xfsprogs/xfsprogs-dynamic_exe.patch, xfsprogs/xfsprogs-miscfix-v2...

arekm arekm at pld-linux.org
Sat Mar 20 20:50:34 CET 2010 

Author: arekm                        Date: Sat Mar 20 19:50:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.1.1 (unfinished; uzi18 is going to take care for this)

---- Files affected:
packages/xfsprogs:
   xfsprogs-dynamic_exe.patch (1.4 -> 1.5) , xfsprogs-miscfix-v2.patch (1.4 -> 1.5) , xfsprogs-sharedlibs.patch (1.3 -> 1.4) , xfsprogs.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: packages/xfsprogs/xfsprogs-dynamic_exe.patch
diff -u packages/xfsprogs/xfsprogs-dynamic_exe.patch:1.4 packages/xfsprogs/xfsprogs-dynamic_exe.patch:1.5
--- packages/xfsprogs/xfsprogs-dynamic_exe.patch:1.4	Wed Feb  4 23:39:33 2009
+++ packages/xfsprogs/xfsprogs-dynamic_exe.patch	Sat Mar 20 20:50:28 2010
@@ -49,18 +49,20 @@
 diff -Nur xfsprogs-2.7.11/libxcmd/Makefile xfsprogs-2.7.11.dynamic/libxcmd/Makefile
 --- xfsprogs-2.7.11/libxcmd/Makefile	2006-01-17 04:46:49.000000000 +0100
 +++ xfsprogs-2.7.11.dynamic/libxcmd/Makefile	2006-03-10 18:13:51.000000000 +0100
-@@ -24,4 +24,10 @@
+@@ -32,6 +32,12 @@
  
  include $(BUILDRULES)
  
 -install install-dev install-qa: default
-+install: default
-+	$(INSTALL_LTLIB)
++install: default                                                                                                                                            
++	$(INSTALL_LTLIB)                                                                                                                                     
++
++install-dev: default                                                                                                                                        
++	$(INSTALL_LTLIB_DEV)                                                                                                                                 
 +
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+       
 +install-qa: default
+ 
+ -include .dep
 diff -Nur xfsprogs-2.7.11/logprint/Makefile xfsprogs-2.7.11.dynamic/logprint/Makefile
 --- xfsprogs-2.7.11/logprint/Makefile	2006-01-17 04:46:50.000000000 +0100
 +++ xfsprogs-2.7.11.dynamic/logprint/Makefile	2006-03-10 18:13:45.000000000 +0100
@@ -78,13 +80,13 @@
 +++ xfsprogs-2.7.11.dynamic/mkfs/Makefile	2006-03-10 18:13:45.000000000 +0100
 @@ -13,7 +13,7 @@
  
- LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK)
- LTDEPENDENCIES = $(LIBXFS) $(LIBDISK)
+ LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
+ LTDEPENDENCIES = $(LIBXFS)
 -LLDFLAGS = -static
-+LLDFLAGS = 
++LLDFLAGS =
  
- LSRCFILES = $(FSTYP).c
- LDIRT = $(FSTYP)
+ ifeq ($(ENABLE_BLKID),yes)
+ LLDLIBS += $(LIBBLKID)
 diff -Nur xfsprogs-2.7.11/quota/Makefile xfsprogs-2.7.11.dynamic/quota/Makefile
 --- xfsprogs-2.7.11/quota/Makefile	2006-01-17 04:46:51.000000000 +0100
 +++ xfsprogs-2.7.11.dynamic/quota/Makefile	2006-03-10 18:13:45.000000000 +0100

================================================================
Index: packages/xfsprogs/xfsprogs-miscfix-v2.patch
diff -u packages/xfsprogs/xfsprogs-miscfix-v2.patch:1.4 packages/xfsprogs/xfsprogs-miscfix-v2.patch:1.5
--- packages/xfsprogs/xfsprogs-miscfix-v2.patch:1.4	Sun Oct 17 16:31:46 2004
+++ packages/xfsprogs/xfsprogs-miscfix-v2.patch	Sat Mar 20 20:50:28 2010
@@ -13,3 +13,4 @@
 -    done
      AC_SUBST(have_zipped_manpages)
    ])
+

================================================================
Index: packages/xfsprogs/xfsprogs-sharedlibs.patch
diff -u packages/xfsprogs/xfsprogs-sharedlibs.patch:1.3 packages/xfsprogs/xfsprogs-sharedlibs.patch:1.4
--- packages/xfsprogs/xfsprogs-sharedlibs.patch:1.3	Wed Feb  4 23:39:34 2009
+++ packages/xfsprogs/xfsprogs-sharedlibs.patch	Sat Mar 20 20:50:28 2010
@@ -1,17 +1,3 @@
-diff -ur xfsprogs-3.0.0.org/libdisk/Makefile xfsprogs-3.0.0/libdisk/Makefile
---- xfsprogs-3.0.0.org/libdisk/Makefile	2009-01-28 20:13:16.000000000 +0100
-+++ xfsprogs-3.0.0/libdisk/Makefile	2009-02-04 23:09:19.331922399 +0100
-@@ -25,8 +25,9 @@
- include $(BUILDRULES)
- 
- install: default
-+	$(INSTALL_LTLIB)
- 
- install-dev: default
--	$(INSTALL_LTLIB_STATIC)
-+	$(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
 diff -ur xfsprogs-3.0.0.org/libxfs/Makefile xfsprogs-3.0.0/libxfs/Makefile
 --- xfsprogs-3.0.0.org/libxfs/Makefile	2009-01-28 20:13:16.000000000 +0100
 +++ xfsprogs-3.0.0/libxfs/Makefile	2009-02-04 23:09:19.331922399 +0100
@@ -37,16 +23,17 @@
  # don't want to link xfs_repair with a debug libxlog.
  DEBUG = -DNDEBUG
  
-@@ -19,4 +21,10 @@
+@@ -21,6 +21,12 @@
  
  include $(BUILDRULES)
  
 -install install-dev install-qa: default
-+install: default
-+	$(INSTALL_LTLIB)
++install: default                                                                                                                                            
++	$(INSTALL_LTLIB)                                                                                                                                     
++
++install-dev: default                                                                                                                                        
++	$(INSTALL_LTLIB_DEV)                                                                                                                                 
 +
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
-+       
 +install-qa: default
-
+ 
+ -include .dep

================================================================
Index: packages/xfsprogs/xfsprogs.spec
diff -u packages/xfsprogs/xfsprogs.spec:1.128 packages/xfsprogs/xfsprogs.spec:1.129
--- packages/xfsprogs/xfsprogs.spec:1.128	Wed Oct 21 11:53:29 2009
+++ packages/xfsprogs/xfsprogs.spec	Sat Mar 20 20:50:28 2010
@@ -7,12 +7,12 @@
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	3.0.3
-Release:	1
+Version:	3.1.1
+Release:	0.1
 License:	LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-# Source0-md5:	41bac47fb49a98857f346bbc1c164872
+# Source0-md5:	c2308b46ee707597ac50aae418d321b8
 Patch0:		%{name}-miscfix-v2.patch
 Patch1:		%{name}-install-sh.patch
 Patch2:		%{name}-sharedlibs.patch
@@ -21,7 +21,7 @@
 Patch5:		%{name}-LDFLAGS.patch
 Patch6:		%{name}-diet.patch
 Patch7:		%{name}-static-librt.patch
-URL:		http://oss.sgi.com/projects/xfs/
+URL:		http://www.xfs.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bash
@@ -35,6 +35,7 @@
 	%endif
 %endif
 BuildRequires:	gettext-devel
+BuildRequires:	libblkid-devel
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	readline-devel
@@ -202,8 +203,6 @@
 
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*) \
 	 $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
-ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libdisk.so.*.*.*) \
-	$RPM_BUILD_ROOT%{_libexecdir}/libdisk.so
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxcmd.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libexecdir}/libxcmd.so
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxfs.so.*.*.*) \
@@ -211,8 +210,11 @@
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxlog.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
 
+mv $RPM_BUILD_ROOT%{_libdir}/lib*.la $RPM_BUILD_ROOT%{_libexecdir}
+mv $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libexecdir}
+
 %{__sed} -i -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
-	$RPM_BUILD_ROOT%{_libexecdir}/lib{disk,handle,xcmd,xfs,xlog}.la
+	$RPM_BUILD_ROOT%{_libexecdir}/lib{handle,xcmd,xfs,xlog}.la
 %{__sed} -i -e "s| %{_libdir}/libxfs.la | %{_libexecdir}/libxfs.la |" \
 	$RPM_BUILD_ROOT%{_libexecdir}/libxlog.la
 
@@ -226,7 +228,6 @@
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # already in /usr
-rm -f $RPM_BUILD_ROOT%{_libdir}/libdisk.{a,la,so}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libhandle.{a,la,so}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libxcmd.{a,la,so}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libxfs.{a,la,so}
@@ -245,12 +246,10 @@
 %attr(755,root,root) %{_sbindir}/mkfs.xfs
 %attr(755,root,root) %{_sbindir}/xfs_repair
 %attr(755,root,root) %{_bindir}/xfs_*
-%attr(755,root,root) %{_libdir}/libdisk.so.*.*
 %attr(755,root,root) %{_libdir}/libhandle.so.*.*
 %attr(755,root,root) %{_libdir}/libxcmd.so.*.*
 %attr(755,root,root) %{_libdir}/libxfs.so.*.*
 %attr(755,root,root) %{_libdir}/libxlog.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdisk.so.0
 %attr(755,root,root) %ghost %{_libdir}/libhandle.so.1
 %attr(755,root,root) %ghost %{_libdir}/libxcmd.so.0
 %attr(755,root,root) %ghost %{_libdir}/libxfs.so.0
@@ -264,12 +263,10 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/libdisk.so
 %attr(755,root,root) %{_libexecdir}/libhandle.so
 %attr(755,root,root) %{_libexecdir}/libxcmd.so
 %attr(755,root,root) %{_libexecdir}/libxfs.so
 %attr(755,root,root) %{_libexecdir}/libxlog.so
-%{_libexecdir}/libdisk.la
 %{_libexecdir}/libhandle.la
 %{_libexecdir}/libxcmd.la
 %{_libexecdir}/libxfs.la
@@ -280,7 +277,6 @@
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/libdisk.a
 %{_libexecdir}/libhandle.a
 %{_libexecdir}/libxcmd.a
 %{_libexecdir}/libxfs.a
@@ -303,6 +299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2010/03/20 19:50:28  arekm
+- up to 3.1.1 (unfinished; uzi18 is going to take care for this)
+
 Revision 1.128  2009/10/21 09:53:29  glen
 - make build on ac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs-dynamic_exe.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs-miscfix-v2.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs-sharedlibs.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfsprogs/xfsprogs.spec?r1=1.128&r2=1.129&f=u

More information about the pld-cvs-commit mailing list