- fix version in taglib-config, taglib.pc

This commit is contained in:
Rex Dieter 2010-04-12 17:51:25 +00:00
parent 886bb70239
commit 20b6df4104
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,36 @@
diff -up taglib-1.6.2/CMakeLists.txt.version taglib-1.6.2/CMakeLists.txt
--- taglib-1.6.2/CMakeLists.txt.version 2009-10-31 04:23:58.000000000 -0500
+++ taglib-1.6.2/CMakeLists.txt 2010-04-12 12:41:33.283034565 -0500
@@ -40,7 +40,7 @@ endif (WIN32)
SET(TAGLIB_LIB_MAJOR_VERSION "1")
SET(TAGLIB_LIB_MINOR_VERSION "6")
-SET(TAGLIB_LIB_PATCH_VERSION "1")
+SET(TAGLIB_LIB_PATCH_VERSION "2")
SET(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
diff -up taglib-1.6.2/taglib-config.cmake.version taglib-1.6.2/taglib-config.cmake
--- taglib-1.6.2/taglib-config.cmake.version 2010-04-12 12:45:04.243035643 -0500
+++ taglib-1.6.2/taglib-config.cmake 2010-04-12 12:44:23.969034972 -0500
@@ -34,7 +34,7 @@ do
flags="$flags -I$includedir/taglib"
;;
--version)
- echo 1.6.2
+ echo ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
;;
--prefix)
echo $prefix
diff -up taglib-1.6.2/taglib.pc.cmake.version taglib-1.6.2/taglib.pc.cmake
diff -up taglib-1.6.2/taglib.pc.in.version taglib-1.6.2/taglib.pc.in
--- taglib-1.6.2/taglib.pc.in.version 2009-09-03 13:05:58.000000000 -0500
+++ taglib-1.6.2/taglib.pc.in 2010-04-12 12:35:19.120033452 -0500
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: TagLib
Description: Audio meta-data library
Requires:
-Version: 1.6
+Version: 1.6.2
Libs: -L${libdir} -ltag
Cflags: -I${includedir}/taglib

View File

@ -12,7 +12,7 @@
Name: taglib
Version: 1.6.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Audio Meta-Data Library
Group: System Environment/Libraries
@ -30,6 +30,9 @@ Patch1: taglib-1.5b1-multilib.patch
# try 2, kiss omit -L%_libdir
Patch2: taglib-1.5rc1-multilib.patch
## upstream patches
Patch100: taglib-1.6.2-version.patch
BuildRequires: cmake
BuildRequires: pkgconfig
BuildRequires: zlib-devel
@ -81,6 +84,8 @@ Files needed when building software with %{name}.
## omit for now
%patch2 -p1 -b .multilib
%patch100 -p1 -b .version
%build
mkdir -p %{_target_platform}
@ -152,6 +157,9 @@ rm -rf %{buildroot}
%changelog
* Mon Apr 12 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.6.2-2
- fix version in taglib-config, taglib.pc
* Fri Apr 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.6.2-1
- taglib-1.6.2