diff --git a/.gitignore b/.gitignore index 0ca4e80..85b3cb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libvpd-2.1.1.tar.gz +/libvpd-2.1.2.tar.gz diff --git a/libvpd-2.1.2-numbering.patch b/libvpd-2.1.2-numbering.patch new file mode 100644 index 0000000..f233f98 --- /dev/null +++ b/libvpd-2.1.2-numbering.patch @@ -0,0 +1,31 @@ +diff -up libvpd-2.1.2/Makefile.am.numbering libvpd-2.1.2/Makefile.am +--- libvpd-2.1.2/Makefile.am.numbering 2011-01-31 08:16:06.186984320 +0100 ++++ libvpd-2.1.2/Makefile.am 2011-01-31 08:16:32.951983869 +0100 +@@ -49,9 +49,9 @@ C_VERSION=@GENERIC_C_LIBRARY_VERSION@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libvpd-2.pc libvpd_cxx-2.pc + +-libvpd_cxx_la_LDFLAGS = -module -lstdc++ -version-info \ ++libvpd_cxx_la_LDFLAGS = -module -lstdc++ -version-number \ + $(CXX_VERSION) -release @GENERIC_RELEASE@ +-libvpd_la_LDFLAGS = -module -version-info \ ++libvpd_la_LDFLAGS = -module -version-number \ + $(C_VERSION) -release @GENERIC_RELEASE@ + + AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' +diff -up libvpd-2.1.2/Makefile.in.numbering libvpd-2.1.2/Makefile.in +--- libvpd-2.1.2/Makefile.in.numbering 2011-01-31 08:16:18.202985277 +0100 ++++ libvpd-2.1.2/Makefile.in 2011-01-31 08:16:51.607984147 +0100 +@@ -267,10 +267,10 @@ CXX_VERSION = @GENERIC_CXX_LIBRARY_VERSI + C_VERSION = @GENERIC_C_LIBRARY_VERSION@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libvpd-2.pc libvpd_cxx-2.pc +-libvpd_cxx_la_LDFLAGS = -module -lstdc++ -version-info \ ++libvpd_cxx_la_LDFLAGS = -module -lstdc++ -version-number \ + $(CXX_VERSION) -release @GENERIC_RELEASE@ + +-libvpd_la_LDFLAGS = -module -version-info \ ++libvpd_la_LDFLAGS = -module -version-number \ + $(C_VERSION) -release @GENERIC_RELEASE@ + + AM_CXXFLAGS = -DDEST_DIR='"${exec_prefix}"' diff --git a/libvpd.spec b/libvpd.spec index 6222920..f214d61 100644 --- a/libvpd.spec +++ b/libvpd.spec @@ -1,9 +1,9 @@ %define name libvpd -%define version 2.1.1 +%define version 2.1.2 Name: %{name} Version: %{version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: VPD Database access library for lsvpd Group: System Environment/Libraries @@ -12,6 +12,8 @@ URL: http://linux-diag.sf.net/Lsvpd.html Source: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: libvpd-2.1.2-numbering.patch + BuildRequires: sqlite-devel zlib-devel libstdc++-devel %description @@ -28,6 +30,8 @@ Contains header files for building with libvpd. %prep %setup -q +%patch1 -p1 -b .numbering + %build %configure --disable-static %{__make} %{?_smp_mflags} @@ -60,6 +64,10 @@ Contains header files for building with libvpd. %{_libdir}/pkgconfig/libvpd_cxx-2.pc %changelog +* Mon Feb 14 2011 Jiri Skala 2.1.2-1 +- Update to latest upstream 2.1.2 +- fixes library numbering + * Tue Feb 08 2011 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a9df352..4a40771 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90013a3460cd4ada7502b6ae28a9e0d3 libvpd-2.1.1.tar.gz +d4e66ec416eac3a87c790cbdc1c628f4 libvpd-2.1.2.tar.gz