Author: saispo
Date: Thu Feb 8 10:22:38 2007
New Revision: 117590
Added:
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.7-libwmf-config.patch.bz2
(contents, props changed)
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.3-CAN-2004-0941.patch.bz2
(contents, props changed)
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.3-CAN-2004-0990.patch.bz2
(contents, props changed)
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.4-intoverflow.patch.bz2
(contents, props changed)
Removed:
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.7-libwmf-config.patch
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.3-CAN-2004-0941.patch
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.3-CAN-2004-0990.patch
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.4-intoverflow.patch
Modified:
packages/cooker/libwmf/current/SPECS/libwmf.spec
Log:
MDKSA-2007:036
Added:
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.7-libwmf-config.patch.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.3-CAN-2004-0941.patch.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.3-CAN-2004-0990.patch.bz2
==============================================================================
Binary file. No diff available.
Added:
packages/cooker/libwmf/current/SOURCES/libwmf-0.2.8.4-intoverflow.patch.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/libwmf/current/SPECS/libwmf.spec
==============================================================================
--- packages/cooker/libwmf/current/SPECS/libwmf.spec (original)
+++ packages/cooker/libwmf/current/SPECS/libwmf.spec Thu Feb 8 10:22:38 2007
@@ -1,9 +1,9 @@
%define name libwmf
%define version 0.2.8.4
-%define api 0.2
-%define major 7
+%define major 0.2_7
+%define subrel 1
%define release %mkrel 13
-%define libname %mklibname wmf%{api}_ %major
+%define libname %mklibname wmf %major
Summary: A library to convert wmf files
Name: %{name}
@@ -13,18 +13,23 @@
Group: Text tools
BuildRequires: automake1.9
BuildRequires: freetype2-devel
-BuildRequires: gtk+2-devel
+BuildRequires: libgdk_pixbuf2.0-devel
BuildRequires: png-devel
BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
BuildRequires: libx11-devel
BuildRequires: libice-devel
+# we should probably split this package b/c of this:
+Requires(post): %{libname}
+Requires(post): %_bindir/gdk-pixbuf-query-loaders
+Requires(postun):%_bindir/gdk-pixbuf-query-loaders
+Requires: gtk+2.0 >= 2.9
URL: http://sourceforge.net/projects/wvware/
Source:
http://download.sourceforge.net/wvware/%{name}-%{version}.tar.bz2
-Patch: libwmf-0.2.7-libwmf-config.patch
-Patch1: libwmf-0.2.8.3-CAN-2004-0941.patch
-Patch2: libwmf-0.2.8.3-CAN-2004-0990.patch
-Patch3: libwmf-0.2.8.4-intoverflow.patch
+Patch: libwmf-0.2.7-libwmf-config.patch.bz2
+Patch1: libwmf-0.2.8.3-CAN-2004-0941.patch.bz2
+Patch2: libwmf-0.2.8.3-CAN-2004-0990.patch.bz2
+Patch3: libwmf-0.2.8.4-intoverflow.patch.bz2
Patch4: libwmf-0.2.8.4-CVE-2007-0455.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -37,10 +42,7 @@
%package -n %libname
Summary: A library to convert wmf files. - library files
Group: System/Libraries
-Requires: urw-fonts
-Conflicts: %name < 0.2.8.4-7
-Requires(post): gtk+2.0
-Requires(postun): gtk+2.0
+Requires: urw-fonts libwmf = %{version}
%description -n %libname
This package contains the library needed to run programs dynamically
@@ -84,13 +86,14 @@
make
%install
-rm -rf $RPM_BUILD_ROOT installed-docs
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_prefix}/share/doc/* installed-docs
-
+mkdir -p $RPM_BUILD_ROOT%{_docdir}
+mv $RPM_BUILD_ROOT%{_prefix}/share/doc/*
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp COPYING CREDITS README NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
#gw no windows line endings
-perl -pi -e 's/\r//' $(find installed-docs -type f )
+perl -pi -e 's/\r//' $(find $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -type
f )
# remove anything relevant to fonts.
rm -rf $RPM_BUILD_ROOT%{_bindir}/libwmf-fontmap
$RPM_BUILD_ROOT%{_datadir}/libwmf
@@ -103,40 +106,195 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n %libname
-/sbin/ldconfig
+%post -n %libname -p /sbin/ldconfig
+
+%postun -n %libname -p /sbin/ldconfig
+
+%post
%_bindir/gdk-pixbuf-query-loaders %_lib >
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders.%_lib
-%postun -n %libname
-/sbin/ldconfig
-if [ -x %_bindir/gdk-pixbuf-query-loaders ]; then
+%postun
%_bindir/gdk-pixbuf-query-loaders %_lib >
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders.%_lib
-fi
%files
# beware not to take gd files here!
%defattr(-,root,root)
-%docdir COPYING
+%docdir %{_docdir}/%{name}-%{version}
+%{_docdir}/%{name}-%{version}
%{_bindir}/wmf2*
+%{_libdir}/gtk-*
%files -n %libname
# beware not to take gd files here!
%defattr(-,root,root)
%doc COPYING
-%{_libdir}/libwmf*-%{api}.so.%{major}*
-%_libdir/gtk-2.0/*/loaders/io-wmf.so
-%_libdir/gtk-2.0/*/loaders/io-wmf.la
+%{_libdir}/libwmf-*so*
+%{_libdir}/libwmflite-*so*
%files -n %libname-devel
# beware not to take gd files here!
%defattr(-,root,root)
-%doc COPYING CREDITS README NEWS
-%doc installed-docs/*
-%doc ChangeLog
+%doc ChangeLog COPYING
%{_bindir}/libwmf-config
%multiarch %{multiarch_bindir}/libwmf-config
%{_libdir}/libwmf.la
%{_libdir}/libwmf.so
+#%{_libdir}/libwmf.a
%{_libdir}/libwmflite.la
%{_libdir}/libwmflite.so
+#%{_libdir}/libwmflite.a
%{_includedir}/libwmf
+
+%changelog
+* Mon Feb 05 2007 Stew Benedict <[EMAIL PROTECTED]> 0.2.8.4-6.1mdv2007.0
+- P4: security fix for CVE-2007-0455 (embedded GD)
+
+* Wed Aug 23 2006 Marcel Pol <[EMAIL PROTECTED]> 0.2.8.4-6mdv2007.0
+- P3: security fix for CVE-2006-3376 (from Fedora, thx Stew)
+
+* Sat Jul 15 2006 Christiaan Welvaart <[EMAIL PROTECTED]> 0.2.8.4-5
+- add BuildRequires: libexpat-devel libjpeg-devel libx11-devel libice-devel
+
+* Sat Jul 01 2006 Marcel Pol <[EMAIL PROTECTED]> 0.2.8.4-4mdv2007.0
+-- P1: security fix for CAN-2004-0941 (embedded GD)
+-- P2: security fix for CVE-2006-0990
+
+* Tue Jun 20 2006 Götz Waschk <[EMAIL PROTECTED]> 0.2.8.4-1mdv2007.0
+- Rebuild
+
+* Thu Jun 8 2006 G�tz Waschk <[EMAIL PROTECTED]> 0.2.8.4-2mdv2007.0
+- rebuild for new gtk
+- fix deps
+
+* Thu Oct 06 2005 Marcel Pol <[EMAIL PROTECTED]> 0.2.8.4-1mdk
+- 0.2.8.4
+
+* Thu Sep 08 2005 Frederic Crozat <[EMAIL PROTECTED]> 0.2.8.3-6mdk
+- Fix post requires
+
+* Tue May 31 2005 G�tz Waschk <[EMAIL PROTECTED]> 0.2.8.3-5mdk
+- move the gdk-pixbuf-query-loaders call to the main package
+
+* Fri May 20 2005 G�tz Waschk <[EMAIL PROTECTED]> 0.2.8.3-4mdk
+- fix automake calls
+- replace prereq by the new syntax
+
+* Wed Feb 9 2005 Gwenole Beauchesne <[EMAIL PROTECTED]> 0.2.8.3-3mdk
+- multiarch
+
+* Wed Aug 04 2004 Thierry Vignaud <[EMAIL PROTECTED]> 0.2.8.3-2mdk
+- biarch support
+
+* Mon May 31 2004 Marcel Pol <[EMAIL PROTECTED]> 0.2.8.3-1mdk
+- 0.2.8.3
+- drop patch1, merged upstream
+
+* Sat Apr 3 2004 G�tz Waschk <[EMAIL PROTECTED]> 0.2.8-7mdk
+- rebuild for new gtk
+
+* Sun Jan 18 2004 Thierry Vignaud <[EMAIL PROTECTED]> 0.2.8-6mdk
+- patch 1: fix build with newer freetype (#6579, Marcel Pol)
+
+* Sat Nov 22 2003 Stefan van der Eijk <[EMAIL PROTECTED]> 0.2.8-5mdk
+- BuildRequires
+
+* Tue Aug 5 2003 Gwenole Beauchesne <[EMAIL PROTECTED]> 0.2.8-4mdk
+- BuildRequires: libxpm-devel
+
+* Mon Jul 21 2003 G�tz Waschk <[EMAIL PROTECTED]> 0.2.8-3mdk
+- mklibname macro
+- fix buildrequires
+
+* Fri Jan 10 2003 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.8-2mdk
+- fixed library name since assuming major of library was 0.2_8
+ while it has been kept as 0.2_7.
+
+* Thu Jan 09 2003 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.8-1mdk
+- 0.2.8.
+
+* Thu Oct 31 2002 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.7-3mdk
+- fixed libwmf-config (-I/usr/include and -L/usr/lib).
+- added require to libwmf data files from shared library.
+- removed static libraries.
+
+* Thu Oct 17 2002 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.7-2mdk
+- called libtoolize.
+
+* Wed Oct 16 2002 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.7-1mdk
+- removed libwmf-fonts and use urw-fonts instead.
+- 0.2.7.
+
+* Fri Jul 26 2002 Gwenole Beauchesne <[EMAIL PROTECTED]> 0.2.5-3mdk
+- rpmlint fixes: configure-without-libdir-spec
+
+* Wed May 29 2002 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.5-2mdk
+- fix some libraries missing.
+
+* Tue May 28 2002 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.5-1mdk
+- 0.2.5.
+
+* Tue Nov 06 2001 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.2-1mdk
+- 0.2.2.
+
+* Wed Oct 10 2001 Till Kamppeter <[EMAIL PROTECTED]> 0.2.1-2mdk
+- Rebuilt for libpng3.
+
+* Fri Aug 24 2001 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.1-1mdk
+- 0.2.1.
+
+* Mon Jul 02 2001 Fran�ois Pons <[EMAIL PROTECTED]> 0.2.0-3mdk
+- clean up and split to create libwmf0.2_0 and libwmf-fonts,
+ renamed libwmf-devel to libwmf0.2_0-devel.
+
+* Sun Jul 01 2001 Stefan van der Eijk <[EMAIL PROTECTED]> 0.2.0-2mdk
+- BuildRequires: libpng-devel
+- BuildRequires: libxml2-devel
+- BuildRequires: freetype2-devel
+- Removed BuildRequires: freetype-devel
+
+* Mon Jun 18 2001 Daouda Lo <[EMAIL PROTECTED]> 0.2.0-1mdk
+- release 0.2.0
+- spec cleanups
+
+* Tue Dec 19 2000 Fran�ois Pons <[EMAIL PROTECTED]> 0.1.21-1mdk
+- update files and requires.
+- 0.1.21.
+
+* Tue Nov 7 2000 Guillaume Cottenceau <[EMAIL PROTECTED]> 0.1.19-4mdk
+- fix summary
+
+* Fri Oct 20 2000 Fran�ois Pons <[EMAIL PROTECTED]> 0.1.19-3mdk
+- avoid updating gd with older version here, newer does not run with.
+
+* Fri Oct 20 2000 Fran�ois Pons <[EMAIL PROTECTED]> 0.1.19-2mdk
+- reverted back include files where they are expected.
+
+* Fri Oct 20 2000 Fran�ois Pons <[EMAIL PROTECTED]> 0.1.19-1mdk
+- macroszifications.
+- moved include files to a specific directory.
+- updated URL and download page to latest modified version.
+- 0.1.19.
+
+* Mon Aug 07 2000 Frederic Lepied <[EMAIL PROTECTED]> 0.1.8-4mdk
+- automatically added BuildRequires
+
+* Tue May 02 2000 Lenny Cartier <[EMAIL PROTECTED]> 0.1.8-3mdk
+- fix group
+
+* Wed Apr 21 1999 Sean P. Kane <[EMAIL PROTECTED]>
+- Upgraded to version 0.1.8
+
+* Tue Apr 13 1999 Ryan Weaver <[EMAIL PROTECTED]>
+ [libwmf-0.1.7-1]
+- Initial RPM Build
+- 0.1.7
+- added ability to gd to read xbm's from data, rather than file,
+ changed source accordingly, dont need to carry xbm's around
+ anymore.
+- changed configure script to agressively find the xpm header file,
+- tested to work under aix (of all things :-))
+- tested to work under solaris.
+- checked that it reports lack of xpm lib, and fails to go any
+ further.
+- fiddled a bit more, and libwmf now works cleanly with mswordview,
+ all cheer.
