diff --git a/_service b/_service deleted file mode 100644 index 9d4f720..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - - http - downloads.xiph.org - /releases/vorbis/libvorbis-1.3.2.tar.bz2 - - - _service:download_url:libvorbis-1.3.2.tar.bz2 - sha256 - 9f04b60ba89edbe860dc0a5902171e4ac35cff8ba19252aa23ed029994823395 - - - diff --git a/_service:set_version:libvorbis.spec b/_service:set_version:libvorbis.spec deleted file mode 100644 index 7948651..0000000 --- a/_service:set_version:libvorbis.spec +++ /dev/null @@ -1,150 +0,0 @@ -# -# spec file for package libvorbis (Version to_be_filled_by_service) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define _SO_nr 0 - -Name: libvorbis -Version: 1.3.2 -Release: 1 -License: BSD3c(or similar) -Summary: The Vorbis General Audio Compression Codec -Url: http://www.vorbis.com/ -Group: System/Libraries -# bug437293 (SLES10 -> SLES11 upgrade path) -%ifarch ppc64 -Obsoletes: libvorbis-64bit -%endif -# -Source: %{name}-%{version}.tar.bz2 -Source2: baselibs.conf -Patch1: libvorbis-lib64.dif -Patch2: libvorbis-m4.dif -# URL http://www.geocities.jp/aoyoume/aotuv/ -# Patch5: libvorbis-%{version}-aotuv-b5.7.diff -# PATCH-FIX-UPSTREAM libvorbis-pkgconfig.patch https://trac.xiph.org/ticket/1759 reddwarf@opensuse.org -- Use Requires/Libs.private to avoid overlinking -Patch10: libvorbis-pkgconfig.patch -BuildRequires: libogg-devel -BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and -general-purpose compressed audio format for audio and music at fixed -and variable bit rates from 16 to 128 kbps/channel. - -The native bitstream format of Vorbis is libogg (Ogg). Alternatively, -libmatroska (matroska) can also be used. - -%package -n libvorbis%{_SO_nr} - -Summary: The Vorbis General Audio Compression Codec -Group: System/Libraries -# bug437293 (SLES10 -> SLES11 upgrade path) -%ifarch ppc64 -Obsoletes: libvorbis-64bit -%endif -# -# libvorbis was last used in openSUSE 11.3 -Provides: %{name} = %{version} -Obsoletes: %{name} <= 1.2.3 - -%description -n libvorbis%{_SO_nr} -Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and -general-purpose compressed audio format for audio and music at fixed -and variable bit rates from 16 to 128 kbps/channel. - -The native bitstream format of Vorbis is libogg (Ogg). Alternatively, -libmatroska (matroska) can also be used. - -%package devel -License: BSD3c(or similar) -Summary: Include Files and Libraries mandatory for Ogg Vorbis Development -Group: Development/Libraries/C and C++ -Requires: libvorbis%{_SO_nr} = %{version} -Requires: glibc-devel -Requires: libogg-devel -# bug437293 (SLES10 -> SLES11 upgrade path) -%ifarch ppc64 -Obsoletes: libvorbis-devel-64bit -%endif -# - -%description devel -This package contains all necessary include files and libraries needed -to compile and develop applications that use libvorbis. - -%package doc -License: BSD3c(or similar) -Summary: Documentation of Ogg/Vorbis library -Group: Documentation/Other -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif - -%description doc -This package contains documents for Ogg/Vorbis library, including the -API reference. - -%prep -%setup -q -%patch2 -# %patch5 -p1 -%patch10 -if [ "%{_lib}" == "lib64" ]; then -%patch1 -fi - -%build -%configure --disable-static -make %{?_smp_mflags} - -%install -%makeinstall -mkdir -p %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/doc/libvorbis-* %{buildroot}%{_docdir}/%{name} -install -c -m 0644 doc/Vorbis_I_spec.* %{buildroot}%{_docdir}/%{name} -# remove unneeded files -rm -f %{buildroot}%{_libdir}/*.la - -%check -%__make check - -%post -n libvorbis%{_SO_nr} -p /sbin/ldconfig - -%postun -n libvorbis%{_SO_nr} -p /sbin/ldconfig - -%clean -[ %{buildroot} != "/" ] && rm -rf %{buildroot} - -%files -n libvorbis%{_SO_nr} -%defattr(0644,root,root,0755) -%doc COPYING AUTHORS README *.txt -%{_libdir}/lib*.so.* - -%files devel -%defattr(-,root,root) -%{_datadir}/aclocal/*.m4 -%{_includedir}/vorbis -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/*.pc - -%files doc -%defattr(-,root,root) -%doc %{_docdir}/%{name} - -%changelog diff --git a/baselibs.conf b/baselibs.conf index db37c42..789fb70 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ libvorbis0 +libvorbisenc2 +libvorbisfile3 diff --git a/_service:download_url:libvorbis-1.3.2.tar.bz2 b/libvorbis-1.3.2.tar.bz2 similarity index 100% rename from _service:download_url:libvorbis-1.3.2.tar.bz2 rename to libvorbis-1.3.2.tar.bz2 diff --git a/libvorbis.changes b/libvorbis.changes index 85fe68c..4823528 100644 --- a/libvorbis.changes +++ b/libvorbis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 9 22:14:53 UTC 2010 - davejplater@gmail.com + +- Split libvorbisenc2 and libvorbisfile3 from libvorbis0 and fixed + build dependency issues of other packages by removing provides + libvorbis and leaving obsoletes libvorbis <= version +- Removed services. + ------------------------------------------------------------------- Wed Dec 8 15:52:05 UTC 2010 - coolo@novell.com diff --git a/libvorbis.spec b/libvorbis.spec index ab12cd0..3ab6ef6 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -19,7 +19,8 @@ %define _SO_nr 0 Name: libvorbis -Version: to_be_filled_by_service +Version: 1.3.2 +#to_be_filled_by_service Release: 1 License: BSD3c(or similar) Summary: The Vorbis General Audio Compression Codec @@ -35,11 +36,11 @@ Source2: baselibs.conf Patch1: libvorbis-lib64.dif Patch2: libvorbis-m4.dif # URL http://www.geocities.jp/aoyoume/aotuv/ -# Patch5: libvorbis-%{version}-aotuv-b5.7.diff +# 'Patch5: libvorbis-%%{version}-aotuv-b5.7.diff' # PATCH-FIX-UPSTREAM libvorbis-pkgconfig.patch https://trac.xiph.org/ticket/1759 reddwarf@opensuse.org -- Use Requires/Libs.private to avoid overlinking Patch10: libvorbis-pkgconfig.patch BuildRequires: libogg-devel -BuildRequires: pkgconfig +BuildRequires: pkgconfig fdupes BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +55,7 @@ libmatroska (matroska) can also be used. Summary: The Vorbis General Audio Compression Codec Group: System/Libraries +License: BSD3c(or similar) # bug437293 (SLES10 -> SLES11 upgrade path) %ifarch ppc64 Obsoletes: libvorbis-64bit @@ -61,8 +63,7 @@ Obsoletes: libvorbis-64bit # # libvorbis was last used in openSUSE 11.3 -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} +Obsoletes: %{name} <= %{version} %description -n libvorbis%{_SO_nr} Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and @@ -72,11 +73,43 @@ and variable bit rates from 16 to 128 kbps/channel. The native bitstream format of Vorbis is libogg (Ogg). Alternatively, libmatroska (matroska) can also be used. +%package -n libvorbisenc2 + +Summary: The Vorbis General Audio Compression Codec +Group: System/Libraries +License: BSD3c(or similar) +Obsoletes: %{name} <= %{version} + +%description -n libvorbisenc2 +Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and +general-purpose compressed audio format for audio and music at fixed +and variable bit rates from 16 to 128 kbps/channel. + +The native bitstream format of Vorbis is libogg (Ogg). Alternatively, +libmatroska (matroska) can also be used. + +%package -n libvorbisfile3 + +Summary: The Vorbis General Audio Compression Codec +Group: System/Libraries +License: BSD3c(or similar) +Obsoletes: %{name} <= %{version} + +%description -n libvorbisfile3 +Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and +general-purpose compressed audio format for audio and music at fixed +and variable bit rates from 16 to 128 kbps/channel. + +The native bitstream format of Vorbis is libogg (Ogg). Alternatively, +libmatroska (matroska) can also be used. + %package devel License: BSD3c(or similar) Summary: Include Files and Libraries mandatory for Ogg Vorbis Development Group: Development/Libraries/C and C++ Requires: libvorbis%{_SO_nr} = %{version} +Requires: libvorbisfile3 = %{version} +Requires: libvorbisenc2 = %{version} Requires: glibc-devel Requires: libogg-devel # bug437293 (SLES10 -> SLES11 upgrade path) @@ -104,7 +137,7 @@ API reference. %prep %setup -q %patch2 -# %patch5 -p1 +# %%patch5 -p1 %patch10 if [ "%{_lib}" == "lib64" ]; then %patch1 @@ -121,6 +154,8 @@ mv %{buildroot}%{_datadir}/doc/libvorbis-* %{buildroot}%{_docdir}/%{name} install -c -m 0644 doc/Vorbis_I_spec.* %{buildroot}%{_docdir}/%{name} # remove unneeded files rm -f %{buildroot}%{_libdir}/*.la +find %{buildroot}%{_docdir}/ -empty -delete +%fdupes -s %{buildroot}%{_docdir} %check %__make check @@ -129,16 +164,32 @@ rm -f %{buildroot}%{_libdir}/*.la %postun -n libvorbis%{_SO_nr} -p /sbin/ldconfig +%post -n libvorbisenc2 -p /sbin/ldconfig + +%postun -n libvorbisenc2 -p /sbin/ldconfig + +%post -n libvorbisfile3 -p /sbin/ldconfig + +%postun -n libvorbisfile3 -p /sbin/ldconfig + %clean [ %{buildroot} != "/" ] && rm -rf %{buildroot} %files -n libvorbis%{_SO_nr} %defattr(0644,root,root,0755) -%doc COPYING AUTHORS README *.txt -%{_libdir}/lib*.so.* +%{_libdir}/libvorbis.so.0* + +%files -n libvorbisenc2 +%defattr(0644,root,root,0755) +%{_libdir}/libvorbisenc.so.2* + +%files -n libvorbisfile3 +%defattr(0644,root,root,0755) +%{_libdir}/libvorbisfile.so.3* %files devel %defattr(-,root,root) +%doc COPYING AUTHORS README *.txt %{_datadir}/aclocal/*.m4 %{_includedir}/vorbis %{_libdir}/lib*.so