- sharedlibs patch - build shared lib{disk,xfs,xlog} too

  (libxfs is needed by xfsdump configure)
- release 2

Changed files:
    xfsprogs-sharedlibs.patch -> 1.1
    xfsprogs.spec -> 1.31

diff --git a/xfsprogs-sharedlibs.patch b/xfsprogs-sharedlibs.patch
new file mode 100644 (file)
index 0000000..9cb2eb5
--- /dev/null
+++ b/xfsprogs-sharedlibs.patch
@@ -0,0 +1,36 @@
+diff -Nur xfsprogs-2.1.2.orig/libdisk/Makefile xfsprogs-2.1.2/libdisk/Makefile
+--- xfsprogs-2.1.2.orig/libdisk/Makefile       Thu Aug  1 21:40:43 2002
++++ xfsprogs-2.1.2/libdisk/Makefile    Tue Aug 20 19:30:56 2002
+@@ -46,6 +46,7 @@
+ include $(BUILDRULES)
+ 
+ install: default
++      $(INSTALL_LTLIB)
+ 
+ install-dev: default
+-      $(INSTALL_LTLIB_STATIC)
++      $(INSTALL_LTLIB_DEV)
+diff -Nur xfsprogs-2.1.2.orig/libxfs/Makefile xfsprogs-2.1.2/libxfs/Makefile
+--- xfsprogs-2.1.2.orig/libxfs/Makefile        Thu Aug  1 21:40:43 2002
++++ xfsprogs-2.1.2/libxfs/Makefile     Tue Aug 20 19:31:04 2002
+@@ -65,6 +65,7 @@
+ include $(BUILDRULES)
+ 
+ install: default
++      $(INSTALL_LTLIB)
+ 
+ install-dev: default
+-      $(INSTALL_LTLIB_STATIC)
++      $(INSTALL_LTLIB_DEV)
+diff -Nur xfsprogs-2.1.2.orig/libxlog/Makefile xfsprogs-2.1.2/libxlog/Makefile
+--- xfsprogs-2.1.2.orig/libxlog/Makefile       Thu Aug  1 21:40:44 2002
++++ xfsprogs-2.1.2/libxlog/Makefile    Tue Aug 20 19:31:12 2002
+@@ -48,6 +48,7 @@
+ include $(BUILDRULES)
+ 
+ install: default
++      $(INSTALL_LTLIB)
+ 
+ install-dev: default
+-      $(INSTALL_LTLIB_STATIC)
++      $(INSTALL_LTLIB_DEV)

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 19d97a492d13749a757fab3897e70c7e52b74fa4..a3d4e8a0f4535f29aa6791181e0f51d2f9d35cf3 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -4,12 +4,13 @@ Summary:      Tools for the XFS filesystem
 Summary(pl):   Narzêdzia do systemu plików XFS
 Name:          xfsprogs
 Version:       2.1.2
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
 Patch0:                %{name}-miscfix-v2.patch
 Patch1:                %{name}-install-sh.patch
+Patch2:                %{name}-sharedlibs.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bash
@@ -75,6 +76,7 @@ Biblioteki statyczne do XFS.
 %setup  -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"
@@ -114,6 +116,9 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man8/xfs_info.8
 echo ".so xfs_growfs.8" > $RPM_BUILD_ROOT%{_mandir}/man8/xfs_info.8
 
 ln -sf %{_libdir}/libhandle.so.1.0.1 $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
+ln -sf %{_libdir}/libdisk.so.0.0.0 $RPM_BUILD_ROOT%{_libexecdir}/libdisk.so
+ln -sf %{_libdir}/libxfs.so.0.0.0 $RPM_BUILD_ROOT%{_libexecdir}/libxfs.so
+ln -sf %{_libdir}/libxlog.so.0.0.0 $RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 %{_includedir}/disk
 %{_includedir}/xfs
-%{_libexecdir}/*.la
+%attr(755,root,root) %{_libexecdir}/*.la
 %attr(755,root,root) %{_libexecdir}/*.so
 
 %files static