rpms/libtar/EL-4 import.log, NONE, 1.1 libtar-1.2.11-missing-protos.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libtar.spec, 1.5, 1.6 sources, 1.2, 1.3
Huzaifa Sidhpurwala
huzaifas at fedoraproject.org
Mon Sep 28 09:56:19 UTC 2009
Author: huzaifas
Update of /cvs/pkgs/rpms/libtar/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6563/EL-4
Modified Files:
.cvsignore libtar.spec sources
Added Files:
import.log libtar-1.2.11-missing-protos.patch
Log Message:
--- NEW FILE import.log ---
libtar-1_2_11-11_rhis:EL-4:libtar-1.2.11-11.rhis.src.rpm:1254117181
libtar-1.2.11-missing-protos.patch:
configure | 13 +++++++------
lib/append.c | 2 ++
lib/output.c | 1 +
lib/wrapper.c | 1 +
4 files changed, 11 insertions(+), 6 deletions(-)
--- NEW FILE libtar-1.2.11-missing-protos.patch ---
diff -up libtar-1.2.11/lib/append.c.foo libtar-1.2.11/lib/append.c
--- libtar-1.2.11/lib/append.c.foo 2003-01-07 02:40:59.000000000 +0100
+++ libtar-1.2.11/lib/append.c 2008-04-03 15:08:07.000000000 +0200
@@ -13,6 +13,8 @@
#include <internal.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/param.h>
diff -up libtar-1.2.11/configure.foo libtar-1.2.11/configure
--- libtar-1.2.11/configure.foo 2008-04-03 15:08:07.000000000 +0200
+++ libtar-1.2.11/configure 2008-04-03 15:09:20.000000000 +0200
@@ -4943,8 +4943,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
rm -f conftest$ac_exeext
@@ -20083,8 +20083,8 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return (2);
+ return (0);
}
_ACEOF
rm -f conftest$ac_exeext
@@ -22411,6 +22411,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
+#include <string.h>
typedef struct {
int length;
@@ -22437,10 +22438,10 @@ int main() {
if ((snprintf(test1, tests[i].length, "%s", tests[i].test)
!= tests[i].retval) ||
(tests[i].result && strcmp(tests[i].result, test1)))
- exit(1);
+ return (1);
}
- exit(0);
+ return (0);
}
_ACEOF
diff -up libtar-1.2.11/lib/output.c~ libtar-1.2.11/lib/output.c
--- libtar-1.2.11/lib/output.c~ 2008-04-03 15:11:07.000000000 +0200
+++ libtar-1.2.11/lib/output.c 2008-04-03 15:11:07.000000000 +0200
@@ -13,6 +13,7 @@
#include <internal.h>
#include <stdio.h>
+#include <stdlib.h>
#include <pwd.h>
#include <grp.h>
#include <time.h>
diff -up libtar-1.2.11/lib/wrapper.c~ libtar-1.2.11/lib/wrapper.c
--- libtar-1.2.11/lib/wrapper.c~ 2008-04-03 15:11:28.000000000 +0200
+++ libtar-1.2.11/lib/wrapper.c 2008-04-03 15:11:28.000000000 +0200
@@ -13,6 +13,7 @@
#include <internal.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/param.h>
#include <dirent.h>
#include <errno.h>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:47:49 -0000 1.2
+++ .cvsignore 28 Sep 2009 09:56:19 -0000 1.3
@@ -1 +1,2 @@
libtar-1.2.11.tar.gz
+libtar_1.2.11-4.diff.gz
Index: libtar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-4/libtar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libtar.spec 10 Dec 2004 22:03:06 -0000 1.5
+++ libtar.spec 28 Sep 2009 09:56:19 -0000 1.6
@@ -1,16 +1,15 @@
-Summary: Tar file manipulation API
-Name: libtar
-Version: 1.2.11
-Release: 3
-Epoch: 0
-License: BSD
-Group: System Environment/Libraries
-URL: http://www-dev.cites.uiuc.edu/libtar/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Provides: libtar-devel = %{epoch}:%{name}-%{version}
-BuildRequires: zlib-devel
-
+Summary: Tar file manipulation API
+Name: libtar
+Version: 1.2.11
+Release: 11%{?dist}
+License: MIT
+Group: System Environment/Libraries
+URL: http://www.feep.net/libtar/
+Source0: ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz
+Patch0: http://ftp.debian.org/debian/pool/main/libt/libtar/libtar_1.2.11-4.diff.gz
+Patch1: libtar-1.2.11-missing-protos.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: zlib-devel libtool
%description
libtar is a C library for manipulating tar archives. It supports both
@@ -18,38 +17,96 @@ the strict POSIX tar format and many of
extensions.
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
%prep
%setup -q
+%patch0 -p1 -z .deb
+%patch1 -p1
+# set correct version for .so build
+%define ltversion %(echo %{version} | tr '.' ':')
+sed -i 's/-rpath $(libdir)/-rpath $(libdir) -version-number %{ltversion}/' \
+ lib/Makefile.in
%build
-%configure
+cp /usr/share/libtool/config.sub /usr/share/libtool/ltmain.sh autoconf
+%configure --disable-static
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+# Without this we get no debuginfo and stripping
+chmod +x $RPM_BUILD_ROOT%{_libdir}/libtar.so.%{version}
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
%files
%defattr(-,root,root,-)
%doc COPYRIGHT TODO README ChangeLog*
%{_bindir}/%{name}
+%{_libdir}/lib*.so.*
+
+%files devel
+%defattr(-,root,root,-)
%{_includedir}/libtar.h
%{_includedir}/libtar_listhash.h
-%{_libdir}/lib*.a
+%{_libdir}/lib*.so
%{_mandir}/man3/*.3*
%changelog
+* Thu Apr 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-11
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.11-10
+- Autorebuild for GCC 4.3
+
+* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-9
+- Update License tag for new Licensing Guidelines compliance
+
+* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-8
+- FE6 Rebuild
+
+* Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.11-7
+- Taking over as maintainer since Anvil has other priorities
+- Add a bunch of patches from Debian, which build a .so instead of a .a
+ and fix a bunch of memory leaks.
+- Reinstate a proper devel package as we now build a .so
+
+* Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 1.2.11-6.fc5
+- Modified URL and added one in Source0
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.11-5
+- rebuild on all arches
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 0:1.2.11-0.fdr.3
- Merged devel and main packages
- Package provide now libtar-devel
-* Tue Jul 8 2003 Dams <anvil[AT]livna.org>
+* Tue Jul 8 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libtar/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 8 Nov 2004 04:47:49 -0000 1.2
+++ sources 28 Sep 2009 09:56:19 -0000 1.3
@@ -1 +1,2 @@
604238e8734ce6e25347a58c4f1a1d7e libtar-1.2.11.tar.gz
+8149a09f4baef9a879ef5f74dab1c32e libtar_1.2.11-4.diff.gz
More information about the scm-commits
mailing list