diff options
| author | Thomas Vander Stichele <thomasvs@xiph.org> | 2004-07-05 11:17:48 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomasvs@xiph.org> | 2004-07-05 11:17:48 +0000 |
| commit | d765286bcec84846609a27f0c29f229faa44ce45 (patch) | |
| tree | fa4d99e9c959ac539bc09a013b3eb8161cfa2073 | |
| parent | 39ea1f46a1274d8be09c8f9fa742838fa2758e60 (diff) | |
| download | ogg-git-d765286bcec84846609a27f0c29f229faa44ce45.tar.gz | |
* autogenerate from configure
* fix download location
* remove Prefix
* own include dir
* move ldconfig runs to -p scripts
* change Release tag to include xiph
svn path=/trunk/ogg/; revision=6991
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | libogg.spec.in (renamed from libogg.spec) | 30 |
3 files changed, 22 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 577c8ca..756ac31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,9 @@ m4data_DATA = ogg.m4 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: diff --git a/configure.in b/configure.in index 9bdfe07..28566c2 100644 --- a/configure.in +++ b/configure.in @@ -295,6 +295,7 @@ doc/Makefile doc/ogg/Makefile include/Makefile include/ogg/Makefile include/ogg/config_types.h win32/Makefile debian/Makefile +libogg.spec ogg.pc ogg-uninstalled.pc ]) diff --git a/libogg.spec b/libogg.spec.in index c9c290b..2bf7ab8 100644 --- a/libogg.spec +++ b/libogg.spec.in @@ -1,15 +1,15 @@ Name: libogg -Version: 1.1 -Release: 1 -Summary: Ogg Bitstream Library +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@xiph.org> -Source: http://www.xiph.org/pub/ogg/vorbis/download/%{name}-%{version}.tar.gz -Prefix: %{_prefix} +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 @@ -31,7 +31,6 @@ Requires: libogg = %{version} 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. @@ -44,18 +43,16 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --enable-static make %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -72,6 +69,7 @@ make DESTDIR=$RPM_BUILD_ROOT install %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 @@ -82,6 +80,14 @@ make DESTDIR=$RPM_BUILD_ROOT install %{_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@xiph.org> - update for 1.1 release |