[xiph-commits] r6991 - trunk/ogg

thomasvs at dactyl.lonelymoon.com thomasvs
Mon Jul 5 04:17:48 PDT 2004


Author: thomasvs
Date: Mon Jul  5 04:17:48 2004
New Revision: 6991

Added:
trunk/ogg/libogg.spec.in
Removed:
trunk/ogg/libogg.spec
Modified:
trunk/ogg/Makefile.am
trunk/ogg/configure.in
Log:
* autogenerate from configure
* fix download location
* remove Prefix
* own include dir
* move ldconfig runs to -p scripts
* change Release tag to include xiph



Modified: trunk/ogg/Makefile.am
===================================================================
--- trunk/ogg/Makefile.am	2004-07-05 11:13:36 UTC (rev 6990)
+++ trunk/ogg/Makefile.am	2004-07-05 11:17:48 UTC (rev 6991)
@@ -10,7 +10,9 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ogg.pc

-EXTRA_DIST = README AUTHORS CHANGES COPYING libogg.spec ogg.m4 ogg.pc.in \
+EXTRA_DIST = README AUTHORS CHANGES COPYING \
+	libogg.spec libogg.spec.in \
+	ogg.m4 ogg.pc.in \
macos macosx

dist-hook:

Modified: trunk/ogg/configure.in
===================================================================
--- trunk/ogg/configure.in	2004-07-05 11:13:36 UTC (rev 6990)
+++ trunk/ogg/configure.in	2004-07-05 11:17:48 UTC (rev 6991)
@@ -295,6 +295,7 @@
include/Makefile include/ogg/Makefile include/ogg/config_types.h
win32/Makefile
debian/Makefile
+libogg.spec
ogg.pc
ogg-uninstalled.pc
])

Deleted: trunk/ogg/libogg.spec
===================================================================
--- trunk/ogg/libogg.spec	2004-07-05 11:13:36 UTC (rev 6990)
+++ trunk/ogg/libogg.spec	2004-07-05 11:17:48 UTC (rev 6991)
@@ -1,100 +0,0 @@
-Name:		libogg
-Version:	1.1
-Release:	1
-Summary:	Ogg Bitstream Library
-
-Group:		System Environment/Libraries
-License:	BSD
-URL:		http://www.xiph.org/
-Vendor:		Xiph.org Foundation <team at xiph.org>
-Source:		http://www.xiph.org/pub/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Prefix:		%{_prefix}
-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}
-
-%description
-Libogg is a library for manipulating ogg bitstreams.  It handles
-both making ogg bitstreams and getting packets from ogg bitstreams.
-
-%package devel
-Summary: 	Ogg Bitstream Library Development
-Group: 		Development/Libraries
-Requires: 	libogg = %{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 libogg-devel package contains the header files, static libraries
-and documentation needed to develop applications with libogg.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static
-make
-
-%install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS CHANGES COPYING README
-%{_libdir}/libogg.so.*
-
-%files devel
-%defattr(-,root,root)
-%doc doc/index.html
-%doc doc/framing.html
-%doc doc/oggstream.html
-%doc doc/white-ogg.png
-%doc doc/white-xifish.png
-%doc doc/stream.png
-%doc doc/ogg/*.html
-%doc doc/ogg/style.css
-%{_includedir}/ogg/ogg.h
-%{_includedir}/ogg/os_types.h
-%{_includedir}/ogg/config_types.h
-%{_libdir}/libogg.a
-%{_libdir}/libogg.la
-%{_libdir}/libogg.so
-%{_libdir}/pkgconfig/ogg.pc
-%{_datadir}/aclocal/ogg.m4
-
-%changelog
-* Tue Oct 07 2003 Warren Dukes <shank at xiph.org>
-- update for 1.1 release
-
-* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
-- update for 1.0 release
-- conform Group to Red Hat's idea of it
-- take out case where configure doesn't exist; a tarball should have it
-
-* Tue Dec 18 2001 Jack Moffitt <jack at xiph.org>
-- Update for RC3 release
-
-* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
-- add support for configurable prefixes
-
-* Sat Sep 02 2000 Jack Moffitt <jack at icecast.org>
-- initial spec file created

Added: trunk/ogg/libogg.spec.in
===================================================================
--- trunk/ogg/libogg.spec.in	2004-07-05 11:13:36 UTC (rev 6990)
+++ trunk/ogg/libogg.spec.in	2004-07-05 11:17:48 UTC (rev 6991)
@@ -0,0 +1,106 @@
+Name:		libogg
+Version:	@VERSION@
+Release:	0.xiph.1
+Summary:	Ogg Bitstream Library.
+
+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}
+
+%description
+Libogg is a library for manipulating ogg bitstreams.  It handles
+both making ogg bitstreams and getting packets from ogg bitstreams.
+
+%package devel
+Summary: 	Ogg Bitstream Library Development
+Group: 		Development/Libraries
+Requires: 	libogg = %{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 libogg-devel package contains the header files, static libraries
+and documentation needed to develop applications with libogg.
+
+%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 CHANGES COPYING README
+%{_libdir}/libogg.so.*
+
+%files devel
+%defattr(-,root,root)
+%doc doc/index.html
+%doc doc/framing.html
+%doc doc/oggstream.html
+%doc doc/white-ogg.png
+%doc doc/white-xifish.png
+%doc doc/stream.png
+%doc doc/ogg/*.html
+%doc doc/ogg/style.css
+%dir %{_includedir}/ogg
+%{_includedir}/ogg/ogg.h
+%{_includedir}/ogg/os_types.h
+%{_includedir}/ogg/config_types.h
+%{_libdir}/libogg.a
+%{_libdir}/libogg.la
+%{_libdir}/libogg.so
+%{_libdir}/pkgconfig/ogg.pc
+%{_datadir}/aclocal/ogg.m4
+
+%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.1 release
+
+* Sun Jul 14 2002 Thomas Vander Stichele <thomas at apestaart.org>
+- update for 1.0 release
+- conform Group to Red Hat's idea of it
+- take out case where configure doesn't exist; a tarball should have it
+
+* Tue Dec 18 2001 Jack Moffitt <jack at xiph.org>
+- Update for RC3 release
+
+* Sun Oct 07 2001 Jack Moffitt <jack at xiph.org>
+- add support for configurable prefixes
+
+* Sat Sep 02 2000 Jack Moffitt <jack at icecast.org>
+- initial spec file created



More information about the commits mailing list