1.8-3.20121215git

- 20121215git snapshot
- .spec cleanup
This commit is contained in:
Rex Dieter 2012-12-15 12:42:50 -06:00
parent 5d191f2e08
commit 6e3fb8c626
5 changed files with 44 additions and 55 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/taglib-1.7.2.tar.gz
/taglib-1.8.tar.gz
/taglib-1.8-20121215git.tar.gz

View File

@ -1 +1 @@
dcb8bd1b756f2843e18b1fdf3aaeee15 taglib-1.8.tar.gz
2ee8f2f055d496e112a380a445bd7e3a taglib-1.8-20121215git.tar.gz

14
taglib-snapshot.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/sh
#if [ -d taglib ]; then
# echo "Remove the \"taglib\" directory first !"
# exit 1
#fi
SNAP="$(date +%Y%m%d)git"
VERSION=1.8
git clone https://github.com/taglib/taglib.git
pushd taglib >& /dev/null
git archive --prefix=taglib-${VERSION}/ master | gzip -9 > ../taglib-${VERSION}-${SNAP}.tar.gz
popd >& /dev/null

View File

@ -1,9 +0,0 @@
#!/bin/sh
if [ -d taglib ]; then
echo "Remove the \"taglib\" directory first !"
exit 1
fi
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib
tar -czf taglib-`date +%Y%m%d`.tar.gz taglib
rm -rf taglib

View File

@ -1,29 +1,25 @@
# Fedora cvs admin requests for taglib: http://bugzilla.redhat.com/418271
%bcond_without tests
%if %{with tests}
%global buildtests -DBUILD_TESTS=ON
%endif
%bcond_without doc
%global apidocdir __api-doc_fedora
Name: taglib
Version: 1.8
Release: 2%{?dist}
Summary: Audio Meta-Data Library
%define snap 20121215git
Name: taglib
Summary: Audio Meta-Data Library
Version: 1.8
Release: 3.%{snap}%{?dist}
Group: System Environment/Libraries
License: LGPLv2
#URL: http://developer.kde.org/~wheeler/taglib.html
URL: http://launchpad.net/taglib
#URL: http://launchpad.net/taglib
URL: http://taglib.github.com/
%if 0%{?snap:1}
Source0: taglib-%{version}-%{snap}.tar.gz
%else
Source0: https://github.com/downloads/taglib/taglib/taglib-%{version}%{?pre}.tar.gz
#Source0: taglib-%{svn}.tar.gz
# The svn tarball is generated with the following script
Source1: taglib-svn.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%endif
# The snapshot tarballs generated with the following script:
Source1: taglib-snapshot.sh
# http://bugzilla.redhat.com/343241
# try 1, use pkg-config
@ -31,9 +27,6 @@ Patch1: taglib-1.5b1-multilib.patch
# try 2, kiss omit -L%_libdir
Patch2: taglib-1.5rc1-multilib.patch
## upstreamable patches
Patch50: taglib-1.8-version.patch
BuildRequires: cmake
BuildRequires: pkgconfig
BuildRequires: zlib-devel
@ -45,33 +38,24 @@ BuildRequires: doxygen
BuildRequires: graphviz
%endif
%description
TagLib is a library for reading and editing the meta-data of several
popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3
files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
Speex, WavPack, TrueAudio files, as well as APE Tags.
%if %{with doc}
%package doc
Summary: API Documentation for %{name}
Group: Documentation
%if 0%{?fedora} > 9 || 0%{?rhel} > 5
BuildArch: noarch
%endif
%description doc
This is API documentation generated from the TagLib source code.
%endif
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: %{name}%{?_isa} = %{version}-%{release}
%if ! %{with doc}
Obsoletes: %{name}-doc
%endif
%description devel
Files needed when building software with %{name}.
@ -82,14 +66,13 @@ Files needed when building software with %{name}.
# patch1 not applied
## omit for now
%patch2 -p1 -b .multilib
%patch50 -p1 -b .version
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} \
%{?buildtests} \
%{?with_tests:-DBUILD_TESTS:BOOL=ON} \
..
popd
@ -101,8 +84,6 @@ make docs -C %{_target_platform}
%install
rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%if %{with doc}
@ -112,28 +93,27 @@ ln -s html/index.html %{apidocdir}
find %{apidocdir} -name '*.md5' | xargs rm -fv
%endif
%if %{with tests}
%check
ln -s ../../tests/data %{_target_platform}/tests/
LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check -C %{_target_platform}
export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
test "$(pkg-config --modversion taglib)" = "%{version}.0"
test "$(pkg-config --modversion taglib_c)" = "%{version}.0"
%if %{with tests}
#ln -s ../../tests/data %{_target_platform}/tests/
#LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH \
make check -C %{_target_platform}
%endif
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING.LGPL NEWS
%{_libdir}/libtag.so.1*
%{_libdir}/libtag_c.so.0*
%files devel
%defattr(-,root,root,-)
%doc examples
%{_bindir}/taglib-config
%{_includedir}/taglib/
@ -144,12 +124,15 @@ rm -rf %{buildroot}
%if %{with doc}
%files doc
%defattr(-,root,root,-)
%doc %{apidocdir}/*
%endif
%changelog
* Sat Dec 15 2012 Rex Dieter <rdieter@fedoraproject.org> 1.8-3.20121215git
- 20121215git snapshot
- .spec cleanup
* Thu Sep 13 2012 Rex Dieter <rdieter@fedoraproject.org> 1.8-2
- taglib.h: fix TAGLIB_MINOR_VERSION