From f0977fd28a2a889d1911b5a945834e74197c3d6b Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 10 Aug 2011 10:07:24 +0200 Subject: [PATCH] update to latest upstream 2.1.3 --- .gitignore | 1 + libvpd-2.1.2-numbering.patch | 31 ------------------------------- libvpd.spec | 14 +++++++------- sources | 2 +- 4 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 libvpd-2.1.2-numbering.patch diff --git a/.gitignore b/.gitignore index 85b3cb7..b3acf2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libvpd-2.1.1.tar.gz /libvpd-2.1.2.tar.gz +/libvpd-2.1.3.tar.gz diff --git a/libvpd-2.1.2-numbering.patch b/libvpd-2.1.2-numbering.patch deleted file mode 100644 index f233f98..0000000 --- a/libvpd-2.1.2-numbering.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 8c98f2d..56797d6 100644 --- a/libvpd.spec +++ b/libvpd.spec @@ -1,9 +1,9 @@ %define name libvpd -%define version 2.1.2 +%define version 2.1.3 Name: %{name} Version: %{version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: VPD Database access library for lsvpd Group: System Environment/Libraries @@ -12,9 +12,7 @@ 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 +BuildRequires: sqlite-devel zlib-devel libstdc++-devel libtool %description The libvpd package contains the classes that are used to access a vpd database @@ -30,9 +28,8 @@ Contains header files for building with libvpd. %prep %setup -q -%patch1 -p1 -b .numbering - %build +./bootstrap.sh %configure --disable-static %{__make} %{?_smp_mflags} @@ -64,6 +61,9 @@ Contains header files for building with libvpd. %{_libdir}/pkgconfig/libvpd_cxx-2.pc %changelog +* Wed Aug 10 2011 Jiri Skala 2.1.3-1 +- update to latest upstream 2.1.3 + * Mon Feb 14 2011 Jiri Skala 2.1.2-2 - rebuild due to tag correction diff --git a/sources b/sources index 4a40771..69289a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4e66ec416eac3a87c790cbdc1c628f4 libvpd-2.1.2.tar.gz +e73fcf739dd0275f4793fc52394fe6cb libvpd-2.1.3.tar.gz