[xiph-cvs] cvs commit: vorbis configure.in libvorbis.spec

[Michael Smith]

msmith      02/07/18 23:48:17

  Modified:    .        configure.in libvorbis.spec
  Log:
  thomasvs's spec file updates.

Revision  Changes    Path
1.62      +1 -0      vorbis/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- configure.in	2002/07/11 22:15:07	1.61
+++ configure.in	2002/07/19 06:48:15	1.62
@@ -164,6 +164,7 @@
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
 XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
+AC_CHECK_LIB(ogg, oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
 
 dnl --------------------------------------------------
 dnl Check for library functions

<p><p>1.19      +41 -29    vorbis/libvorbis.spec

Index: libvorbis.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis/libvorbis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libvorbis.spec	2002/07/11 14:16:05	1.18
+++ libvorbis.spec	2002/07/19 06:48:15	1.19
@@ -1,20 +1,27 @@
-%define name	libvorbis
-%define version	1.0
-%define release 1
-
+Name:		libvorbis
+Version:	1.0
+Release:	1
 Summary:	The Vorbis General Audio Compression Codec
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Group:		Libraries/Multimedia
-Copyright:	BSD
+
+Group:		System Environment/Libraries
+License:	BSD
 URL:		http://www.xiph.org/
 Vendor:		Xiph.org Foundation <team at xiph.org>
-Source:		ftp://ftp.xiph.org/pub/ogg/vorbis/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-root
-Requires:	libogg >= 1.0rc3
+Source:		http://www.xiph.org/pub/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Prefix:		%{_prefix}
+BuildRoot:	%{_tmppath}/%{name}-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.0
+BuildRequires:	libogg-devel >= 1.0
+
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
 general-purpose compressed audio format for audio and music at fixed 
@@ -23,28 +30,38 @@
 %package devel
 Summary: 	Vorbis Library Development
 Group: 		Development/Libraries
-Requires:	libogg-devel >= 1.0rc3
+Requires:	libogg-devel >= 1.0
 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 and documentation
-needed to develop applications with libvorbis.
+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
-if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{_prefix}
-else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
-fi
+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 COPYING
@@ -71,16 +88,11 @@
 %{_libdir}/libvorbisenc.a
 %{_libdir}/libvorbisenc.so
 
-%clean 
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
 %changelog
+* 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>

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.