Accepting request 347028 from home:posophe:branches:network:utilities

update

OBS-URL: https://build.opensuse.org/request/show/347028
OBS-URL: https://build.opensuse.org/package/show/network:utilities/libmetalink?expand=0&rev=11
This commit is contained in:
Marcus Meissner 2015-12-03 14:59:16 +00:00 committed by Git OBS Bridge
parent eaa104552c
commit da34b84a74
4 changed files with 46 additions and 52 deletions

BIN
libmetalink-0.1.3.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,14 +1,15 @@
--- configure.ac.orig --- configure.ac.orig
+++ configure.ac +++ configure.ac
@@ -21,8 +21,6 @@ @@ -22,9 +22,6 @@
# THE SOFTWARE.
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([libmetalink], [0.1.2], [t-tujikawa@users.sourceforge.net]) AC_INIT([libmetalink], [0.1.3], [t-tujikawa@users.sourceforge.net])
-LT_PREREQ([2.2.6]) -LT_PREREQ([2.2.6])
-LT_INIT() -LT_INIT()
-
dnl See versioning rule: dnl See versioning rule:
dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST(LT_CURRENT, 4)
@@ -63,7 +61,10 @@ AC_ARG_ENABLE([gcc-visibility], @@ -63,7 +61,10 @@ AC_ARG_ENABLE([gcc-visibility],
[gcc_visibility=$withval], [gcc_visibility=no]) [gcc_visibility=$withval], [gcc_visibility=no])
@ -21,20 +22,6 @@
AC_PROG_INSTALL AC_PROG_INSTALL
# Package version # 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.orig
+++ lib/libexpat_metalink_parser.c +++ lib/libexpat_metalink_parser.c
@@ -130,7 +130,7 @@ METALINK_PUBLIC @@ -130,7 +130,7 @@ METALINK_PUBLIC
@ -48,10 +35,9 @@
r = metalink_parse_fp(docfp, res); r = metalink_parse_fp(docfp, res);
--- lib/Makefile.am.orig --- lib/Makefile.am.orig
+++ lib/Makefile.am +++ lib/Makefile.am
@@ -1,8 +1,8 @@ @@ -1,7 +1,7 @@
SUBDIRS = includes SUBDIRS = includes
AM_CFLAGS = -Wall
-AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \ -AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \
- @XML_CPPFLAGS@ @EXPAT_CFLAGS@ \ - @XML_CPPFLAGS@ @EXPAT_CFLAGS@ \
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(srcdir)/includes -I$(builddir)/includes \ +AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(srcdir)/includes -I$(builddir)/includes \

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Dec 1 15:14:18 UTC 2015 - p.drouand@gmail.com
- Update to version 0.1.3
* This release fixes the bug that signature element in metalink v4
was not parsed correctly.
- Update libmetalink-autotools.patch
- Use download Url as source
- Perform a spec-cleaner
- Build with libxml2 and cunit support
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 17:54:17 UTC 2012 - crrodriguez@opensuse.org Tue Nov 20 17:54:17 UTC 2012 - crrodriguez@opensuse.org

View File

@ -1,8 +1,7 @@
# vim: set sw=3 ts=3 noet:
# #
# spec file for package libmetalink # spec file for package spec
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,20 +17,29 @@
%define soname 3 %define soname 3
Name: libmetalink Name: libmetalink
Version: 0.1.2 Version: 0.1.3
Release: 0 Release: 0
Summary: Metalink Library Summary: Metalink Library
License: MIT License: MIT
Group: System/Libraries Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
Url: https://launchpad.net/libmetalink Url: https://launchpad.net/libmetalink
BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: https://launchpad.net/libmetalink/trunk/libmetalink-%{version}/+download/%{name}-%{version}.tar.xz
BuildRequires: libexpat-devel Patch0: libmetalink-autotools.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
Patch: libmetalink-autotools.patch %if 0%{?suse_version} > 1310
BuildRequires: pkgconfig(cunit)
%endif
%if 0%{?suse_version} >= 1310
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(libxml-2.0)
%else
BuildRequires: libexpat-devel
BuildRequires: libxml2-devel
%endif
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Libmetalink is a Metalink library written in C language. It is intended to Libmetalink is a Metalink library written in C language. It is intended to
@ -47,13 +55,6 @@ 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 provide the programs written in C to add Metalink functionality such as parsing
Metalink XML files. Metalink XML files.
Authors:
--------
Tatsuhiro Tsujikawa <tujikawa@users.sourceforge.net>
%package -n libmetalink-devel %package -n libmetalink-devel
Summary: Metalink Library Summary: Metalink Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -67,7 +68,7 @@ Metalink XML files.
%prep %prep
%setup -q %setup -q
%patch %patch0
%build %build
autoreconf -fiv autoreconf -fiv
@ -75,21 +76,19 @@ autoreconf -fiv
--disable-static \ --disable-static \
--with-libexpat --with-libexpat
%__make %{?jobs:-j%{jobs}} make %{?_smp_mflags}
%install %install
%makeinstall make DESTDIR=%{buildroot} install %{?_smp_mflags}
%__rm -rf "%{buildroot}%{_datadir}/doc" rm -rf "%{buildroot}%{_datadir}/doc"
%__rm "%{buildroot}%{_libdir}"/*.la find %{buildroot} -type f -name "*.la" -delete -print
%post -n libmetalink%{soname} -p /sbin/ldconfig %post -n libmetalink%{soname} -p /sbin/ldconfig
%postun -n libmetalink%{soname} -p /sbin/ldconfig %postun -n libmetalink%{soname} -p /sbin/ldconfig
%check %check
%__make test make %{?_smp_mflags} test
%clean
%__rm -rf "%{buildroot}"
%files -n libmetalink%{soname} %files -n libmetalink%{soname}
%defattr(-,root,root) %defattr(-,root,root)
@ -104,9 +103,4 @@ autoreconf -fiv
%{_libdir}/pkgconfig/libmetalink.pc %{_libdir}/pkgconfig/libmetalink.pc
%{_mandir}/man3/metalink*.3* %{_mandir}/man3/metalink*.3*
# Local Variables:
# mode: rpm-spec
# tab-width: 3
# End:
%changelog %changelog