- drop creating shared libxfs, libxlog, libxcmd... thse never meant to be public...

diff --git a/xfsprogs-dynamic_exe.patch b/xfsprogs-dynamic_exe.patch
deleted file mode 100644 (file)
index 51decff..0000000
--- a/xfsprogs-dynamic_exe.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Nur xfsprogs-2.7.11/copy/Makefile xfsprogs-2.7.11.dynamic/copy/Makefile
---- xfsprogs-2.7.11/copy/Makefile      2006-01-17 04:46:46.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/copy/Makefile      2006-03-10 18:13:45.000000000 +0100
-@@ -11,7 +11,7 @@
- 
- LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBPTHREAD)
- LTDEPENDENCIES = $(LIBXFS)
--LLDFLAGS = -static
-+LLDFLAGS = 
- 
- default: $(LTCOMMAND)
- 
-diff -Nur xfsprogs-2.7.11/db/Makefile xfsprogs-2.7.11.dynamic/db/Makefile
---- xfsprogs-2.7.11/db/Makefile        2006-01-17 04:46:46.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/db/Makefile        2006-03-10 18:13:45.000000000 +0100
-@@ -18,7 +18,7 @@
- LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh
- LLDLIBS       = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
--LLDFLAGS += -static
-+LLDFLAGS += 
- 
- ifeq ($(ENABLE_READLINE),yes)
- LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
-diff -Nur xfsprogs-2.7.11/growfs/Makefile xfsprogs-2.7.11.dynamic/growfs/Makefile
---- xfsprogs-2.7.11/growfs/Makefile    2006-01-17 04:46:48.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/growfs/Makefile    2006-03-10 18:13:45.000000000 +0100
-@@ -11,7 +11,7 @@
- 
- LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID)
- LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
--LLDFLAGS = -static
-+LLDFLAGS = 
- LSRCFILES = xfs_info.sh
- 
- default: $(LTCOMMAND)
-diff -Nur xfsprogs-2.7.11/io/Makefile xfsprogs-2.7.11.dynamic/io/Makefile
---- xfsprogs-2.7.11/io/Makefile        2006-01-17 04:46:49.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/io/Makefile        2006-03-10 18:13:45.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- LLDLIBS = $(LIBXCMD) $(LIBHANDLE)
- LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE)
--LLDFLAGS = -static
-+LLDFLAGS = 
- 
- ifeq ($(HAVE_FADVISE),yes)
- CFILES += fadvise.c
-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
-@@ -14,7 +14,7 @@
- 
- LLDLIBS       = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
--LLDFLAGS = -static
-+LLDFLAGS = 
- 
- default: $(LTCOMMAND)
- 
-diff -Nur xfsprogs-2.7.11/mkfs/Makefile xfsprogs-2.7.11.dynamic/mkfs/Makefile
---- xfsprogs-2.7.11/mkfs/Makefile      2006-01-17 04:46:51.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/mkfs/Makefile      2006-03-10 18:13:45.000000000 +0100
-@@ -21,7 +21,7 @@
- 
- LLDLIBS += $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
- LTDEPENDENCIES += $(LIBXFS)
--LLDFLAGS = -static
-+LLDFLAGS =
- 
- LSRCFILES = $(FSTYP).c
- LDIRT = $(FSTYP)
-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
-@@ -16,7 +16,7 @@
- 
- LLDLIBS = $(LIBXCMD)
- LTDEPENDENCIES = $(LIBXCMD)
--LLDFLAGS = -static
-+LLDFLAGS =
- 
- ifeq ($(ENABLE_READLINE),yes)
- LLDLIBS += $(LIBREADLINE) $(LIBTERMCAP)
-diff -Nur xfsprogs-2.7.11/repair/Makefile xfsprogs-2.7.11.dynamic/repair/Makefile
---- xfsprogs-2.7.11/repair/Makefile    2006-01-17 04:46:52.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/repair/Makefile    2006-03-10 18:13:45.000000000 +0100
-@@ -19,7 +19,7 @@
- 
- LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID)
- LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
--LLDFLAGS = -static
-+LLDFLAGS = 
- 
- default: $(LTCOMMAND)
- 
-diff -Nur xfsprogs-2.7.11/rtcp/Makefile xfsprogs-2.7.11.dynamic/rtcp/Makefile
---- xfsprogs-2.7.11/rtcp/Makefile      2006-01-17 04:46:52.000000000 +0100
-+++ xfsprogs-2.7.11.dynamic/rtcp/Makefile      2006-03-10 18:13:45.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- LTCOMMAND = xfs_rtcp
- CFILES = xfs_rtcp.c
--LLDFLAGS = -static
-+LLDFLAGS = 
- 
- default: $(LTCOMMAND)
- 

diff --git a/xfsprogs-sharedlibs.patch b/xfsprogs-sharedlibs.patch
deleted file mode 100644 (file)
index f598c3e..0000000
--- a/xfsprogs-sharedlibs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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,10 @@
- include $(BUILDRULES)
- 
- install: default
-+      $(INSTALL_LTLIB)
- 
- install-dev: default
-+      $(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
-@@ -41,7 +41,9 @@
- include $(BUILDRULES)
- 
- install: default
-+      $(INSTALL_LTLIB)
- 
- install-dev: default
-+      $(INSTALL_LTLIB_DEV)
- 
- install-qa: default
-diff -ur xfsprogs-3.0.0.org/libxlog/Makefile xfsprogs-3.0.0/libxlog/Makefile
---- xfsprogs-3.0.0.org/libxlog/Makefile        2009-01-28 20:13:17.000000000 +0100
-+++ xfsprogs-3.0.0/libxlog/Makefile    2009-02-04 23:09:37.878049126 +0100
-@@ -11,6 +11,7 @@
- LT_AGE = 0
- 
- CFILES = xfs_log_recover.c util.c
-+LTLIBS = $(LIBUUID) $(LIBXFS)
- 
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-@@ -19,6 +20,12 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+      $(INSTALL_LTLIB)
-+
-+install-dev: default
-+      $(INSTALL_LTLIB_DEV)
-+       
-+install-qa: default
- 
- -include .dep
-diff -ur xfsprogs-3.1.1.org/libxcmd/Makefile xfsprogs-3.1.1/libxcmd/Makefile
---- xfsprogs-3.1.1.org/libxcmd/Makefile        2010-01-29 20:46:13.000000000 +0100
-+++ xfsprogs-3.1.1/libxcmd/Makefile    2010-03-20 21:56:24.000000000 +0100
-@@ -12,6 +12,8 @@
- 
- CFILES = command.c input.c paths.c projects.c help.c quit.c
- 
-+LTLIBS = $(LIBREADLINE)
-+
- ifeq ($(HAVE_GETMNTENT),yes)
- LCFLAGS += -DHAVE_GETMNTENT
- endif
-@@ -32,6 +32,13 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+      $(INSTALL_LTLIB)
-+
-+install-dev: default
-+      $(INSTALL_LTLIB_DEV)
-+
-+install-qa: install-dev
-+
- 
- -include .dep

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 77421c904465317751ce14183359dc84b3183dc9..7730f8810ab430d3f0aa2b1b03689e2b77cfde4a 100644 (file)
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -13,12 +13,9 @@ Source0:     ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
 # Source0-md5: 400047b2f6af87c0345b8f0cc00c13db
 Source1:       xfs_lsprojid
 Patch0:                %{name}-miscfix-v2.patch
-Patch2:                %{name}-sharedlibs.patch
-Patch3:                %{name}-pl.po-update.patch
-Patch4:                %{name}-dynamic_exe.patch
-
-Patch6:                %{name}-repair-tcmalloc.patch
-Patch7:                %{name}-noquotasync.patch
+Patch1:                %{name}-pl.po-update.patch
+Patch2:                %{name}-repair-tcmalloc.patch
+Patch3:                %{name}-noquotasync.patch
 URL:           http://www.xfs.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -40,10 +37,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                filterout_ld -Wl,--as-needed
 %endif
 
-# libxlog uses symbols from binary that links to libxlog
-# libxcmd uses ("program") symbol from binary that links to libxcmd
-%define                skip_post_check_so      libxlog.so.0.0.0        libxcmd.so.0.0.0
-
 %define                _sbindir        /sbin
 %define                _bindir         /usr/sbin
 %define                _libdir         /%{_lib}
@@ -101,12 +94,10 @@ Biblioteki statyczne do XFS.
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch1 -p1
 
-%{?with_tcmalloc:%patch6 -p1}
-%patch7 -p1
+%{?with_tcmalloc:%patch2 -p1}
+%patch3 -p1
 
 %build
 %{__aclocal} -I m4
@@ -140,20 +131,12 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xfs_lsprojid
 
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*) \
         $RPM_BUILD_ROOT%{_libexecdir}/libhandle.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.*.*.*) \
-       $RPM_BUILD_ROOT%{_libexecdir}/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{handle,xcmd,xfs,xlog}.la
-%{__sed} -i -e "s| %{_libdir}/libxfs.la | %{_libexecdir}/libxfs.la |" \
-       $RPM_BUILD_ROOT%{_libexecdir}/libxlog.la
+       $RPM_BUILD_ROOT%{_libexecdir}/libhandle.la
 
 echo "#10:/mnt/ftp/roman"  >> $RPM_BUILD_ROOT/etc/projects
 echo "#ftproman:10" >> $RPM_BUILD_ROOT/etc/projid
@@ -163,7 +146,7 @@ echo "#ftproman:10" >> $RPM_BUILD_ROOT/etc/projid
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # already in /usr
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{handle,xcmd,xfs,xlog}.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhandle.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -181,13 +164,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/xfs_repair
 %attr(755,root,root) %{_bindir}/xfs_*
 %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}/libhandle.so.1
-%attr(755,root,root) %ghost %{_libdir}/libxcmd.so.0
-%attr(755,root,root) %ghost %{_libdir}/libxfs.so.0
-%attr(755,root,root) %ghost %{_libdir}/libxlog.so.0
 %{_mandir}/man5/projects.5*
 %{_mandir}/man5/projid.5*
 %{_mandir}/man5/xfs.5*
@@ -198,13 +175,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %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}/libhandle.la
-%{_libexecdir}/libxcmd.la
-%{_libexecdir}/libxfs.la
-%{_libexecdir}/libxlog.la
 %{_includedir}/xfs
 %{_mandir}/man3/*handle.3*
 %{_mandir}/man3/xfsctl.3*
@@ -212,6 +183,3 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libexecdir}/libhandle.a
-%{_libexecdir}/libxcmd.a
-%{_libexecdir}/libxfs.a
-%{_libexecdir}/libxlog.a