rpms/liboggz/EL-5 liboggz-1.1.1-multilib.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 liboggz.spec, 1.10, 1.11 sources, 1.6, 1.7

Michel Alexandre Salim salimma at fedoraproject.org
Mon Jul 5 10:19:23 UTC 2010


Author: salimma

Update of /cvs/pkgs/rpms/liboggz/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24159

Modified Files:
	.cvsignore liboggz.spec sources 
Added Files:
	liboggz-1.1.1-multilib.patch 
Log Message:
Update EL-5 branch to 1.1.1


liboggz-1.1.1-multilib.patch:
 oggz_off_t_generated.h.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE liboggz-1.1.1-multilib.patch ---
--- liboggz-1.1.1.org/include/oggz/oggz_off_t_generated.h.in	2010-01-30 11:25:59.000000000 +0530
+++ liboggz-1.1.1/include/oggz/oggz_off_t_generated.h.in	2010-05-29 13:06:00.503337547 +0530
@@ -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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/liboggz/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	12 Jan 2007 04:42:39 -0000	1.6
+++ .cvsignore	5 Jul 2010 10:19:23 -0000	1.7
@@ -1 +1 @@
-liboggz-0.9.5.tar.gz
+liboggz-1.1.1.tar.gz


Index: liboggz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liboggz/EL-5/liboggz.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- liboggz.spec	12 Jan 2007 04:42:39 -0000	1.10
+++ liboggz.spec	5 Jul 2010 10:19:23 -0000	1.11
@@ -1,60 +1,98 @@
 Name:           liboggz
-Version:        0.9.5
+Version:        1.1.1
 Release:        1%{?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-1.1.1-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libogg-devel >= 1.0
 BuildRequires:  doxygen
 BuildRequires:  docbook-utils
 
-# libtool
-BuildRequires:  gcc-c++
-
 %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
+%configure --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
+
+
+%check
+# Tests disabled for moment because of rpath issue
+#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)
@@ -69,15 +107,39 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_includedir}/oggz
 %{_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
+* Sat May 29 2010 Rakesh Pandit <rakesh at fedoraproject.org> - 1.1.1-1
+- Update 1.1.1
+- (CVE-2009-3377) CVE-2009-3377 liboggz: unspecified security fixes mentioned in MFSA 2009-63
+
+* Thu Feb 04 2010 Adam Jackson <ajax at redhat.com> 0.9.8-5
+- --disable-static, drop the .a files
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* 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
+
+* Wed May 21 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.9.7-1
+- Update to 0.9.7
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-2
+- Autorebuild for GCC 4.3
+
 * Fri Jan 12 2007 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.9.5-1
 - new upstream release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/liboggz/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Jan 2007 04:42:39 -0000	1.6
+++ sources	5 Jul 2010 10:19:23 -0000	1.7
@@ -1 +1 @@
-781fab29dea3c5e9d39ecbd1d007fb98  liboggz-0.9.5.tar.gz
+3649a657f8e368b881ba8b1b57381ff7  liboggz-1.1.1.tar.gz



More information about the scm-commits mailing list