From ba2c9719ff33f2b520b1204e7fa4a309fdefe1cd Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Thu, 28 Jul 2005 08:54:37 +0000 Subject: [PATCH] merged patches upstream --- .cvsignore | 1 + libwmf-0.2.8.3-nodocs.patch | 23 ++++++++++------------- libwmf.spec | 18 +++++++++--------- sources | 2 +- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5e50791..f279267 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libwmf-0.2.8.3.tar.gz +libwmf-0.2.8.4.tar.gz diff --git a/libwmf-0.2.8.3-nodocs.patch b/libwmf-0.2.8.3-nodocs.patch index 2e88ac4..cc48fcb 100644 --- a/libwmf-0.2.8.3-nodocs.patch +++ b/libwmf-0.2.8.3-nodocs.patch @@ -13,20 +13,17 @@ diff -ru libwmf-0.2.8.3.orig/Makefile.am libwmf-0.2.8.3/Makefile.am +DIST_SUBDIRS = . src include fonts SUBDIRS = $(DIRHEAVY) - -diff -ru libwmf-0.2.8.3.orig/Makefile.in libwmf-0.2.8.3/Makefile.in ---- libwmf-0.2.8.3.orig/Makefile.in 2004-02-10 12:58:18.000000000 +0000 -+++ libwmf-0.2.8.3/Makefile.in 2004-06-11 13:29:01.996713643 +0100 -@@ -125,10 +125,10 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --@LIBWMF_BUILD_ALL_TRUE@DIRHEAVY = . src include fonts doc -+@LIBWMF_BUILD_ALL_TRUE@DIRHEAVY = . src include fonts + +--- libwmf-0.2.8.4.orig/Makefile.in 2005-07-28 09:46:20.000000000 +0100 ++++ libwmf-0.2.8.4/Makefile.in 2005-07-28 09:46:29.000000000 +0100 +@@ -231,8 +231,8 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ @LIBWMF_BUILD_ALL_FALSE@DIRHEAVY = . src include - +-@LIBWMF_BUILD_ALL_TRUE@DIRHEAVY = . src include fonts doc -DIST_SUBDIRS = . src include fonts doc ++@LIBWMF_BUILD_ALL_TRUE@DIRHEAVY = . src include fonts +DIST_SUBDIRS = . src include fonts - SUBDIRS = $(DIRHEAVY) - + bin_SCRIPTS = libwmf-config + WMFEXAMPLES = \ diff --git a/libwmf.spec b/libwmf.spec index 9d87a74..e3937b8 100644 --- a/libwmf.spec +++ b/libwmf.spec @@ -1,16 +1,13 @@ Summary: Windows Metafile Library Name: libwmf -Version: 0.2.8.3 -Release: 9 +Version: 0.2.8.4 +Release: 1 Group: System Environment/Libraries License: LGPL Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch0: libwmf-0.2.8.3-nodocs.patch Patch1: libwmf-0.2.8.3-relocatablefonts.patch -Patch2: libwmf-0.2.8.3-warnings.patch -Patch3: libwmf-0.2.8.3-noextras.patch -Patch4: libwmf-0.2.8.3-rh154813.patch Requires: gtk2 >= 2.4.1-2 Requires: libxml2 >= 2.6.8 Requires: gd >= 2.0.21 @@ -42,16 +39,13 @@ Libraries, headers, and support files necessary to compile applications using li %setup -q %patch0 -p1 -b .nodocs %patch1 -p1 -b .relocatablefonts -%patch2 -p1 -b .warnings -%patch3 -p1 -b .noextras -%patch4 -p1 -b .rh154813 %build rm configure.ac libtoolize --force --copy aclocal-1.4 autoconf -automake-1.4 +automake-1.4 -a %configure --with-libxml2 export tagname=CC make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} @@ -101,6 +95,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la rm -r $RPM_BUILD_ROOT %changelog +* Thu Jul 28 2005 Caolan McNamara 0.2.8.4-1 +- get patches merged upstream +- drop integrated libwmf-0.2.8.3-warnings.patch +- drop integrated libwmf-0.2.8.3-noextras.patch +- drop integrated libwmf-0.2.8.3-rh154813.patch + * Tue Jul 26 2005 Caolan McNamara 0.2.8.3-9 - rh#154813# wmf upsidedown, spec (what of is there is) says that this shouldn't happen, but... diff --git a/sources b/sources index 91179c9..cd07d4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b058327bb14d2373260a74beb7f3e2f libwmf-0.2.8.3.tar.gz +d1177739bf1ceb07f57421f0cee191e0 libwmf-0.2.8.4.tar.gz