rpms/liboggz/devel liboggz-0.9.8-multilib.patch, NONE, 1.1 liboggz.spec, 1.14, 1.15
Michel Alexandre Salim
salimma at fedoraproject.org
Wed Dec 31 07:51:24 UTC 2008
- Previous message (by thread): rpms/liboggz/F-9 liboggz-0.9.8-multilib.patch, NONE, 1.1 liboggz.spec, 1.13, 1.14
- Next message (by thread): rpms/awstats/F-10 awstats-6.9-CVE-2008-3714-debian.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 awstats.spec, 1.25, 1.26 sources, 1.12, 1.13 awstats-6.8-CVE-2008-3714-debian.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: salimma
Update of /cvs/pkgs/rpms/liboggz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26864/devel
Modified Files:
liboggz.spec
Added Files:
liboggz-0.9.8-multilib.patch
Log Message:
* Tue Dec 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.9.8-2
- Multilib fixes (bugs #342291, #477291)
liboggz-0.9.8-multilib.patch:
--- NEW FILE liboggz-0.9.8-multilib.patch ---
--- liboggz-0.9.8/include/oggz/oggz_off_t_generated.h.in.multilib 2008-04-06 00:45:38.000000000 -0400
+++ liboggz-0.9.8/include/oggz/oggz_off_t_generated.h.in 2008-12-31 02:09:03.000000000 -0500
@@ -59,7 +59,7 @@
#include <sys/types.h>
-typedef @TYPEOF_OGGZ_OFF_T@ oggz_off_t;
+typedef loff_t oggz_off_t;
#define PRI_OGGZ_OFF_T "@PRI_OGGZ_OFF_T@"
Index: liboggz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboggz/devel/liboggz.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- liboggz.spec 17 Jul 2008 22:56:09 -0000 1.14
+++ liboggz.spec 31 Dec 2008 07:50:54 -0000 1.15
@@ -1,12 +1,14 @@
Name: liboggz
Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple programming interface for Ogg files and streams
Group: System Environment/Libraries
License: BSD
URL: http://www.annodex.net/
-Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz
+Source0: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz
+# Always have oggz_off_t == loff_t even on 64-bit platforms
+Patch0: liboggz-0.9.8-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libogg-devel >= 1.0
@@ -14,47 +16,80 @@
BuildRequires: docbook-utils
%description
-Oggz provides a simple programming interface for reading and writing Ogg files
-and streams. Ogg is an interleaving data container developed by Monty at
-Xiph.Org, originally to support the Ogg Vorbis audio format.
+Oggz provides a simple programming interface for reading and writing
+Ogg files and streams. Ogg is an interleaving data container developed
+by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
%package devel
Summary: Files needed for development using liboggz
Group: Development/Libraries
-Requires: liboggz = %{version}
+Requires: liboggz = %{version}-%{release}
Requires: libogg-devel >= 1.0
Requires: pkgconfig
%description devel
-Oggz provides a simple programming interface for reading and writing Ogg files
-and streams. Ogg is an interleaving data container developed by Monty at
-Xiph.Org, originally to support the Ogg Vorbis audio format.
+Oggz provides a simple programming interface for reading and writing
+Ogg files and streams. Ogg is an interleaving data container developed
+by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
This package contains the header files and documentation needed for
development using liboggz.
+%package doc
+Summary: Documentation for liboggz
+Group: Documentation
+Requires: liboggz = %{version}-%{release}
+
+%description doc
+Oggz provides a simple programming interface for reading and writing
+Ogg files and streams. Ogg is an interleaving data container developed
+by Monty at Xiph.Org, originally to support the Ogg Vorbis audio
+format.
+
+This package contains HTML documentation needed for development using
+liboggz.
+
+
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .multilib
%build
%configure
-make
+make %{?_smp_mflags}
+
%check
make check
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}
+%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version} \
+ INSTALL="%{__install} -p"
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# not particularly interested in the tex docs, the html version has everything
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}/latex
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-doc-%{version}/latex
+
+# Multilib fix: ensure generated headers have timestamps
+# independent of build time
+(cd include/oggz &&
+ touch -r oggz_off_t_generated.h.in.multilib \
+ $RPM_BUILD_ROOT%{_includedir}/oggz/oggz_off_t_generated.h
+)
+
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
@@ -71,13 +106,16 @@
%{_libdir}/liboggz.so
%{_libdir}/liboggz.a
%{_libdir}/pkgconfig/oggz.pc
-%doc %{_docdir}/%{name}-devel-%{version}
-%post -p /sbin/ldconfig
+%files doc
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-doc-%{version}
-%postun -p /sbin/ldconfig
%changelog
+* Tue Dec 30 2008 Michel Salim <salimma at fedoraproject.org> - 0.9.8-2
+- Multilib fixes (bugs #342291, #477291)
+
* Mon Jul 7 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.9.8-1
- Update to 0.9.8
- Previous message (by thread): rpms/liboggz/F-9 liboggz-0.9.8-multilib.patch, NONE, 1.1 liboggz.spec, 1.13, 1.14
- Next message (by thread): rpms/awstats/F-10 awstats-6.9-CVE-2008-3714-debian.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 awstats.spec, 1.25, 1.26 sources, 1.12, 1.13 awstats-6.8-CVE-2008-3714-debian.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list