[xiph-commits] r7346 - trunk/vorbis
thomasvs at dactyl.lonelymoon.com
thomasvs
Mon Jul 26 06:33:43 PDT 2004
Author: thomasvs
Date: Mon Jul 26 06:33:43 2004
New Revision: 7346
Added:
trunk/vorbis/libvorbis.spec.in
Removed:
trunk/vorbis/libvorbis.spec
Modified:
trunk/vorbis/Makefile.am
trunk/vorbis/configure.in
Log:
This patch autogenerates spec file from configure and fixes some spec issues
Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am 2004-07-26 13:31:38 UTC (rev 7345)
+++ trunk/vorbis/Makefile.am 2004-07-26 13:33:43 UTC (rev 7346)
@@ -10,7 +10,8 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
-EXTRA_DIST = HACKING todo.txt macos macosx autogen.sh libvorbis.spec \
+EXTRA_DIST = HACKING todo.txt macos macosx autogen.sh \
+ libvorbis.spec libvorbis.spec.in \
vorbis.m4 vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in
dist-hook:
Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in 2004-07-26 13:31:38 UTC (rev 7345)
+++ trunk/vorbis/configure.in 2004-07-26 13:33:43 UTC (rev 7346)
@@ -223,6 +223,7 @@
win32/Makefile
debian/Makefile
vq/Makefile
+libvorbis.spec
vorbis.pc
vorbisenc.pc
vorbisfile.pc
Deleted: trunk/vorbis/libvorbis.spec
===================================================================
--- trunk/vorbis/libvorbis.spec 2004-07-26 13:31:38 UTC (rev 7345)
+++ trunk/vorbis/libvorbis.spec 2004-07-26 13:33:43 UTC (rev 7346)
@@ -1,118 +0,0 @@
-Name: libvorbis
-Version: 1.0.1
-Release: 0.xiph.1
-Summary: The Vorbis General Audio Compression Codec.
-
-Group: System Environment/Libraries
-License: BSD
-URL: http://www.xiph.org/
-Vendor: Xiph.org Foundation <team at xiph.org>
-Source: http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-# We're forced to use an epoch since both Red Hat and Ximian use it in their
-# rc packages
-Epoch: 2
-# Dirty trick to tell rpm that this package actually provides what the
-# last rc and beta was offering
-Provides: %{name} = %{epoch}:1.0rc3-%{release}
-Provides: %{name} = %{epoch}:1.0beta4-%{release}
-
-Requires: libogg >= 1.1
-BuildRequires: libogg-devel >= 1.1
-
-%description
-Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
-general-purpose compressed audio format for audio and music at fixed
-and variable bitrates from 16 to 128 kbps/channel.
-
-%package devel
-Summary: Vorbis Library Development
-Group: Development/Libraries
-Requires: libogg-devel >= 1.1
-Requires: libvorbis = %{version}
-# Dirty trick to tell rpm that this package actually provides what the
-# last rc and beta was offering
-Provides: %{name}-devel = %{epoch}:1.0rc3-%{release}
-Provides: %{name}-devel = %{epoch}:1.0beta4-%{release}
-
-%description devel
-The libvorbis-devel package contains the header files, static libraries
-and documentation needed to develop applications with libvorbis.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING README
-%{_libdir}/libvorbis.so.*
-%{_libdir}/libvorbisfile.so.*
-%{_libdir}/libvorbisenc.so.*
-
-%files devel
-%doc doc/*.html
-%doc doc/*.png
-%doc doc/*.txt
-%doc doc/vorbisfile
-%doc doc/vorbisenc
-%{_datadir}/aclocal/vorbis.m4
-%dir %{_includedir}/vorbis
-%{_includedir}/vorbis/codec.h
-%{_includedir}/vorbis/vorbisfile.h
-%{_includedir}/vorbis/vorbisenc.h
-%{_libdir}/libvorbis.a
-%{_libdir}/libvorbis.la
-%{_libdir}/libvorbis.so
-%{_libdir}/libvorbisfile.a
-%{_libdir}/libvorbisfile.la
-%{_libdir}/libvorbisfile.so
-%{_libdir}/libvorbisenc.a
-%{_libdir}/libvorbisenc.la
-%{_libdir}/libvorbisenc.so
-%{_libdir}/pkgconfig/vorbis.pc
-%{_libdir}/pkgconfig/vorbisfile.pc
-%{_libdir}/pkgconfig/vorbisenc.pc
-
-%changelog
-* Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org>
-- autogenerate from configure
-- fix download location
-- remove Prefix
-- own include dir
-- move ldconfig runs to -p scripts
-- change Release tag to include xiph
-
-* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
-- update for 1.0.1 release
-
-* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
-- Added BuildRequires:
-- updated for 1.0 release
-
-* Sat May 25 2002 Michael Smith <msmith at icecast.org>
-- Fixed requires, copyright string.
-* Sun Dec 31 2001 Jack Moffitt <jack at xiph.org>
-- Updated for rc3 release.
-
-* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
-- Updated for configurable prefixes
-
-* Sat Oct 21 2000 Jack Moffitt <jack at icecast.org>
-- initial spec file created
Added: trunk/vorbis/libvorbis.spec.in
===================================================================
--- trunk/vorbis/libvorbis.spec.in 2004-07-26 13:31:38 UTC (rev 7345)
+++ trunk/vorbis/libvorbis.spec.in 2004-07-26 13:33:43 UTC (rev 7346)
@@ -0,0 +1,118 @@
+Name: libvorbis
+Version: @VERSION@
+Release: 0.xiph.1
+Summary: The Vorbis General Audio Compression Codec.
+
+Group: System Environment/Libraries
+License: BSD
+URL: http://www.xiph.org/
+Vendor: Xiph.org Foundation <team at xiph.org>
+Source: http://www.vorbis.com/files/1.0.1/unix/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+# We're forced to use an epoch since both Red Hat and Ximian use it in their
+# rc packages
+Epoch: 2
+# Dirty trick to tell rpm that this package actually provides what the
+# last rc and beta was offering
+Provides: %{name} = %{epoch}:1.0rc3-%{release}
+Provides: %{name} = %{epoch}:1.0beta4-%{release}
+
+Requires: libogg >= 1.1
+BuildRequires: libogg-devel >= 1.1
+
+%description
+Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
+general-purpose compressed audio format for audio and music at fixed
+and variable bitrates from 16 to 128 kbps/channel.
+
+%package devel
+Summary: Vorbis Library Development
+Group: Development/Libraries
+Requires: libogg-devel >= 1.1
+Requires: libvorbis = %{version}
+# Dirty trick to tell rpm that this package actually provides what the
+# last rc and beta was offering
+Provides: %{name}-devel = %{epoch}:1.0rc3-%{release}
+Provides: %{name}-devel = %{epoch}:1.0beta4-%{release}
+
+%description devel
+The libvorbis-devel package contains the header files, static libraries
+and documentation needed to develop applications with libvorbis.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS COPYING README
+%{_libdir}/libvorbis.so.*
+%{_libdir}/libvorbisfile.so.*
+%{_libdir}/libvorbisenc.so.*
+
+%files devel
+%doc doc/*.html
+%doc doc/*.png
+%doc doc/*.txt
+%doc doc/vorbisfile
+%doc doc/vorbisenc
+%{_datadir}/aclocal/vorbis.m4
+%dir %{_includedir}/vorbis
+%{_includedir}/vorbis/codec.h
+%{_includedir}/vorbis/vorbisfile.h
+%{_includedir}/vorbis/vorbisenc.h
+%{_libdir}/libvorbis.a
+%{_libdir}/libvorbis.la
+%{_libdir}/libvorbis.so
+%{_libdir}/libvorbisfile.a
+%{_libdir}/libvorbisfile.la
+%{_libdir}/libvorbisfile.so
+%{_libdir}/libvorbisenc.a
+%{_libdir}/libvorbisenc.la
+%{_libdir}/libvorbisenc.so
+%{_libdir}/pkgconfig/vorbis.pc
+%{_libdir}/pkgconfig/vorbisfile.pc
+%{_libdir}/pkgconfig/vorbisenc.pc
+
+%changelog
+* Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+- autogenerate from configure
+- fix download location
+- remove Prefix
+- own include dir
+- move ldconfig runs to -p scripts
+- change Release tag to include xiph
+
+* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
+- update for 1.0.1 release
+
+* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
+- Added BuildRequires:
+- updated for 1.0 release
+
+* Sat May 25 2002 Michael Smith <msmith at icecast.org>
+- Fixed requires, copyright string.
+* Sun Dec 31 2001 Jack Moffitt <jack at xiph.org>
+- Updated for rc3 release.
+
+* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
+- Updated for configurable prefixes
+
+* Sat Oct 21 2000 Jack Moffitt <jack at icecast.org>
+- initial spec file created
More information about the commits
mailing list