From 410d1215fcd84d34461d40576ca5f41dae4de1c1f50be66733ce05f1906a352d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 20 Nov 2012 17:05:17 +0000 Subject: [PATCH] Accepting request 142162 from home:elvigia:branches:network:utilities - Update to version 0.1.2 * This release adds RFC 5854 Metalink 4.0 support * adds dynamic attribute of the origin element in Metalink - libmetalink-autotools.patch : multiple pet peeves in autotools. OBS-URL: https://build.opensuse.org/request/show/142162 OBS-URL: https://build.opensuse.org/package/show/network:utilities/libmetalink?expand=0&rev=7 --- libmetalink-0.0.3.tar.bz2 | 3 -- libmetalink-0.1.2.tar.bz2 | 3 ++ libmetalink-autotools.patch | 78 +++++++++++++++++++++++++++++++++++++ libmetalink-llong_max.patch | 12 ------ libmetalink.changes | 9 +++++ libmetalink.spec | 31 ++++++--------- 6 files changed, 101 insertions(+), 35 deletions(-) delete mode 100644 libmetalink-0.0.3.tar.bz2 create mode 100644 libmetalink-0.1.2.tar.bz2 create mode 100644 libmetalink-autotools.patch delete mode 100644 libmetalink-llong_max.patch diff --git a/libmetalink-0.0.3.tar.bz2 b/libmetalink-0.0.3.tar.bz2 deleted file mode 100644 index 1e29809..0000000 --- a/libmetalink-0.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bdc2cc0366b2b7bcf16eff31a5edc4d39b41430856afce04ad9dd9bbcc8c42c -size 267023 diff --git a/libmetalink-0.1.2.tar.bz2 b/libmetalink-0.1.2.tar.bz2 new file mode 100644 index 0000000..6d3f1b8 --- /dev/null +++ b/libmetalink-0.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6 +size 324431 diff --git a/libmetalink-autotools.patch b/libmetalink-autotools.patch new file mode 100644 index 0000000..6b1fb3c --- /dev/null +++ b/libmetalink-autotools.patch @@ -0,0 +1,78 @@ +--- configure.ac.orig ++++ configure.ac +@@ -21,8 +21,6 @@ + # THE SOFTWARE. + AC_PREREQ(2.61) + AC_INIT([libmetalink], [0.1.2], [t-tujikawa@users.sourceforge.net]) +-LT_PREREQ([2.2.6]) +-LT_INIT() + + dnl See versioning rule: + dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +@@ -63,7 +61,10 @@ AC_ARG_ENABLE([gcc-visibility], + [gcc_visibility=$withval], [gcc_visibility=no]) + + # Checks for programs +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE ++LT_INIT([disable-static pic-only]) + AC_PROG_INSTALL + + # Package version +@@ -81,13 +82,6 @@ if test "x$with_libexpat" = "xyes"; then + AM_PATH_LIBEXPAT + fi + +-if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then +- AM_PATH_XML2([2.6.24], [have_libxml2=yes]) +- if test "x$have_libxml2" = "xyes"; then +- AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have libxml2.]) +- fi +-fi +- + # cunit + PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) + # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We +--- lib/libexpat_metalink_parser.c.orig ++++ lib/libexpat_metalink_parser.c +@@ -130,7 +130,7 @@ METALINK_PUBLIC + metalink_parse_file(const char* filename, metalink_t** res) + { + metalink_error_t r; +- FILE *docfp = fopen(filename, "rb"); ++ FILE *docfp = fopen(filename, "rbe"); + if(docfp == NULL) + return METALINK_ERR_CANNOT_OPEN_FILE; + r = metalink_parse_fp(docfp, res); +--- lib/Makefile.am.orig ++++ lib/Makefile.am +@@ -1,8 +1,8 @@ + SUBDIRS = includes + + AM_CFLAGS = -Wall +-AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \ +- @XML_CPPFLAGS@ @EXPAT_CFLAGS@ \ ++AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(srcdir)/includes -I$(builddir)/includes \ ++ @EXPAT_CFLAGS@ \ + @DEFS@ + + pkgconfigdir = $(libdir)/pkgconfig +@@ -60,4 +60,4 @@ endif + libmetalink_la_SOURCES = $(HFILES) $(OBJECTS) + libmetalink_la_LDFLAGS = -no-undefined \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- @XML_LIBS@ @EXPAT_LIBS@ ++ @EXPAT_LIBS@ +--- test/Makefile.am.orig ++++ test/Makefile.am +@@ -11,7 +11,7 @@ metalinktest_SOURCES = \ + metalinktest_LDADD = ${top_builddir}/lib/libmetalink.la + metalinktest_LDFLAGS = -static @CUNIT_LIBS@ + +-AM_CFLAGS = -I${top_srcdir}/lib -I${top_srcdir}/lib/includes \ ++AM_CFLAGS = -include $(top_builddir)/config.h -I${top_srcdir}/lib -I${top_srcdir}/lib/includes \ + -I${top_builddir}/lib/includes \ + -DLIBMETALINK_TEST_DIR=\"$(top_srcdir)/test/\" @CUNIT_CFLAGS@ + TESTS = metalinktest diff --git a/libmetalink-llong_max.patch b/libmetalink-llong_max.patch deleted file mode 100644 index d63d4dd..0000000 --- a/libmetalink-llong_max.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/metalink/metalink_pstate.c.orig 2009-11-07 00:19:18.000000000 +0100 -+++ lib/metalink/metalink_pstate.c 2009-11-07 00:19:38.000000000 +0100 -@@ -30,6 +30,9 @@ - #include - #include - #include -+#ifndef LLONG_MAX -+#define LLONG_MAX 9223372036854775807LL -+#endif - - #include "metalink_pstm.h" - diff --git a/libmetalink.changes b/libmetalink.changes index ee6ca2b..d5a6477 100644 --- a/libmetalink.changes +++ b/libmetalink.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 20 17:00:39 UTC 2012 - crrodriguez@opensuse.org + +- Update to version 0.1.2 +* This release adds RFC 5854 Metalink 4.0 support +* adds dynamic attribute of the origin element in Metalink + +- libmetalink-autotools.patch : multiple pet peeves in autotools. + ------------------------------------------------------------------- Sat Sep 24 21:08:12 UTC 2011 - andreas.stieger@gmx.de diff --git a/libmetalink.spec b/libmetalink.spec index 7297fbd..0bc3930 100644 --- a/libmetalink.spec +++ b/libmetalink.spec @@ -1,26 +1,20 @@ # norootforbuild -%define soname 1 +%define soname 3 Name: libmetalink -Version: 0.0.3 +Version: 0.1.2 Release: 0 Summary: Metalink Library Source: http://launchpad.net/libmetalink/trunk/%{version}/+download/libmetalink-%{version}.tar.bz2 -Patch1: libmetalink-llong_max.patch URL: https://launchpad.net/libmetalink Group: System/Libraries License: MIT BuildRoot: %{_tmppath}/build-%{name}-%{version} -BuildRequires: gcc make glibc-devel pkgconfig -BuildRequires: libxml2-devel -%if 0%{?suse_version} >= 1030 +BuildRequires: pkgconfig BuildRequires: libexpat-devel -%else -BuildRequires: expat -%endif -BuildRequires: autoconf automake libtool - +BuildRequires: libtool +Patch: libmetalink-autotools.patch %description Libmetalink is a Metalink library written in C language. It is intended to provide the programs written in C to add Metalink functionality such as parsing @@ -46,6 +40,7 @@ Authors: Summary: Metalink Library Group: Development/Libraries/C and C++ Requires: libmetalink%{soname} = %{version} +Requires: glibc-devel %description -n libmetalink-devel Libmetalink is a Metalink library written in C language. It is intended to @@ -53,18 +48,14 @@ provide the programs written in C to add Metalink functionality such as parsing Metalink XML files. %prep -%setup -q -n "libmetalink-%{version}" -%patch1 - -%if 0%{?suse_version} < 1000 -%__sed -i 's|-fvisibility=hidden||g' lib/metalink/Makefile* -%endif +%setup -q +%patch %build +autoreconf -fiv %configure \ --disable-static \ - --with-libexpat \ - --with-libxml2 + --with-libexpat %__make %{?jobs:-j%{jobs}} @@ -93,7 +84,7 @@ Metalink XML files. %{_includedir}/metalink %{_libdir}/libmetalink.so %{_libdir}/pkgconfig/libmetalink.pc -%doc %{_mandir}/man3/metalink*.3* +%{_mandir}/man3/metalink*.3* %changelog # vim: set sw=3 ts=3 noet: