taglib-1.11beta
This commit is contained in:
parent
c0f93068d8
commit
9d0e3df353
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/taglib-1.9.1.tar.gz
|
||||
/taglib-1.10beta.tar.gz
|
||||
/taglib-1.10.tar.gz
|
||||
/taglib-1.11beta.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
5b4441a15423b046dd92a096e09ea22c taglib-1.10.tar.gz
|
||||
959e2f0a07cb7624908d9fee81067f58 taglib-1.11beta.tar.gz
|
||||
|
@ -1,39 +0,0 @@
|
||||
diff -up taglib-1.5b1/taglib-config.cmake.multilib taglib-1.5b1/taglib-config.cmake
|
||||
--- taglib-1.5b1/taglib-config.cmake.multilib 2008-01-29 19:30:00.000000000 -0600
|
||||
+++ taglib-1.5b1/taglib-config.cmake 2008-02-04 08:37:38.000000000 -0600
|
||||
@@ -14,10 +14,10 @@ EOH
|
||||
exit 1;
|
||||
}
|
||||
|
||||
-prefix=${CMAKE_INSTALL_PREFIX}
|
||||
-exec_prefix=${CMAKE_INSTALL_PREFIX}
|
||||
-libdir=${LIB_INSTALL_DIR}
|
||||
-includedir=${INCLUDE_INSTALL_DIR}
|
||||
+taglib_prefix="`pkg-config --variable=prefix taglib`"
|
||||
+taglib_cflags="`pkg-config --cflags taglib`"
|
||||
+taglib_libs="`pkg-config --libs taglib`"
|
||||
+taglib_version="`pkg-config --modversion taglib`"
|
||||
|
||||
flags=""
|
||||
|
||||
@@ -29,16 +29,16 @@ while test $# -gt 0
|
||||
do
|
||||
case $1 in
|
||||
--libs)
|
||||
- flags="$flags -L$libdir -ltag"
|
||||
+ flags="$flags ${taglib_libs}"
|
||||
;;
|
||||
--cflags)
|
||||
- flags="$flags -I$includedir/taglib"
|
||||
+ flags="$flags ${taglib_cflags}"
|
||||
;;
|
||||
--version)
|
||||
- echo 1.5
|
||||
+ echo ${taglib_version}
|
||||
;;
|
||||
--prefix)
|
||||
- echo $prefix
|
||||
+ echo ${taglib_prefix}
|
||||
;;
|
||||
*)
|
||||
echo "$0: unknown option $1"
|
20
taglib.spec
20
taglib.spec
@ -1,14 +1,14 @@
|
||||
|
||||
%if 0%{?fedora} < 24
|
||||
%bcond_without tests
|
||||
%endif
|
||||
## 1.11 currently disables tests with BUILD_SHARED_LIBS=ON
|
||||
#bcond_without tests
|
||||
#bcond_without doc
|
||||
%global apidocdir __api-doc_fedora
|
||||
%global beta beta
|
||||
|
||||
Name: taglib
|
||||
Summary: Audio Meta-Data Library
|
||||
Version: 1.10
|
||||
Release: 2%{?dist}
|
||||
Version: 1.11
|
||||
Release: 0.1.%{beta}%{?dist}
|
||||
|
||||
License: LGPLv2 or MPLv1.1
|
||||
#URL: http://launchpad.net/taglib
|
||||
@ -22,9 +22,6 @@ Source0: http://taglib.github.io/releases/taglib-%{version}%{?beta}.tar.gz
|
||||
Source1: taglib-snapshot.sh
|
||||
|
||||
# http://bugzilla.redhat.com/343241
|
||||
# try 1, use pkg-config
|
||||
Patch1: taglib-1.5b1-multilib.patch
|
||||
# try 2, kiss omit -L%_libdir
|
||||
Patch2: taglib-1.5rc1-multilib.patch
|
||||
|
||||
## upstream patches
|
||||
@ -74,7 +71,9 @@ Files needed when building software with %{name}.
|
||||
mkdir %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%{cmake} .. \
|
||||
%{?with_tests:-DBUILD_TESTS:BOOL=ON} \
|
||||
%if %{with tests}
|
||||
-DBUILD_TESTS:BOOL=ON \
|
||||
%endif
|
||||
-DCMAKE_BUILD_TYPE:STRING="Release"
|
||||
popd
|
||||
|
||||
@ -132,6 +131,9 @@ make check -C %{_target_platform}
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jan 30 2016 Rex Dieter <rdieter@fedoraproject.org> 1.11-0.1.beta
|
||||
- taglib-1.11beta
|
||||
|
||||
* Sat Jan 30 2016 Rex Dieter <rdieter@fedoraproject.org> 1.10-2
|
||||
- disable regression tests on rawhide (FTBFS)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user