- up to 3.1.1 (unfinished; uzi18 is going to take care for this)

Changed files:
    xfsprogs-dynamic_exe.patch -> 1.5
    xfsprogs-miscfix-v2.patch -> 1.5
    xfsprogs-sharedlibs.patch -> 1.4
    xfsprogs.spec -> 1.129

diff --git a/xfsprogs-dynamic_exe.patch b/xfsprogs-dynamic_exe.patch
index f33d546d03ca941a3cab1192408bddba9a2dd493..49e64d14cdd3f5926792cec4969d66bb51d539e4 100644 (file)
--- a/xfsprogs-dynamic_exe.patch
+++ b/xfsprogs-dynamic_exe.patch
@@ -49,18 +49,20 @@ diff -Nur xfsprogs-2.7.11/io/Makefile xfsprogs-2.7.11.dynamic/io/Makefile
 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 @@ diff -Nur xfsprogs-2.7.11/mkfs/Makefile xfsprogs-2.7.11.dynamic/mkfs/Makefile
 +++ 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

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index 02dea7db8b2b71ddea4fe1d34a0a3dfbb72deecc..8e470b9579f4ded34bb155be5f52211747458a6f 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -13,3 +13,4 @@
 -    done
      AC_SUBST(have_zipped_manpages)
    ])
+

diff --git a/xfsprogs-sharedlibs.patch b/xfsprogs-sharedlibs.patch
index 78c26ce07160ee59bab16688e538d3dbab411529..25e54be6881ed0a94327081ce6bccd91a3d85368 100644 (file)
--- a/xfsprogs-sharedlibs.patch
+++ b/xfsprogs-sharedlibs.patch
@@ -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 @@ diff -ur xfsprogs-3.0.0.org/libxlog/Makefile xfsprogs-3.0.0/libxlog/Makefile
  # 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

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 847cabe3f1d39bc9175beda22b8d3cbf44f5689b..ef30a7bb32171a3bc5e2f5b21c37df03ef0f13b9 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -6,12 +6,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
@@ -20,7 +20,7 @@ Patch4:               %{name}-dynamic_exe.patch
 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
@@ -34,6 +34,7 @@ BuildRequires:        libuuid-static
        %endif
 %endif
 BuildRequires: gettext-devel
+BuildRequires: libblkid-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: readline-devel
@@ -201,8 +202,6 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV
 
 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.*.*.*) \
@@ -210,8 +209,11 @@ ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxfs.so.*.*.*) \
 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
 
@@ -225,7 +227,6 @@ install initrd/* $RPM_BUILD_ROOT%{_libexecdir}/initrd/
 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}
@@ -244,12 +245,10 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -263,12 +262,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -279,7 +276,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/libdisk.a
 %{_libexecdir}/libhandle.a
 %{_libexecdir}/libxcmd.a
 %{_libexecdir}/libxfs.a