From fe3ca3d2cf684751b9943bf498b296e36e9e260d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] - Fix defattr line. - Remove the enable-shared patch, and just use --enable-shared on the configure line. - Disable the GL patch since OpenGL is disabled. - Document what the patches are for in the spec file. - Only patch Makefile.in so we don't have to rerun autotools, and remove autotools dependency. --- jasper/jasper-1.900.1-enable-shared.patch | 10 ---------- jasper/jasper-1.900.1-mingw32.patch | 10 ---------- jasper/mingw32-jasper.spec | 26 +++++++++++++++++--------- 3 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 jasper/jasper-1.900.1-enable-shared.patch diff --git a/jasper/jasper-1.900.1-enable-shared.patch b/jasper/jasper-1.900.1-enable-shared.patch deleted file mode 100644 index bfd8415..0000000 --- a/jasper/jasper-1.900.1-enable-shared.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- jasper-1.900.1.orig/configure.ac 2007-01-19 21:47:11.000000000 +0000 -+++ jasper-1.900.1/configure.ac 2008-09-10 17:31:27.000000000 +0100 -@@ -152,7 +152,6 @@ - # AC_PROG_CPP - # AC_PROG_LN_S - --AM_DISABLE_SHARED - AC_PROG_LIBTOOL - - AC_PATH_XTRA diff --git a/jasper/jasper-1.900.1-mingw32.patch b/jasper/jasper-1.900.1-mingw32.patch index 02180ea..f388349 100644 --- a/jasper/jasper-1.900.1-mingw32.patch +++ b/jasper/jasper-1.900.1-mingw32.patch @@ -1,13 +1,3 @@ -diff -rup jasper-1.900.1.orig/src/libjasper/Makefile.am jasper-1.900.1.new/src/libjasper/Makefile.am ---- jasper-1.900.1.orig/src/libjasper/Makefile.am 2007-01-19 16:43:07.000000000 -0500 -+++ jasper-1.900.1.new/src/libjasper/Makefile.am 2008-09-09 10:08:53.000000000 -0400 -@@ -85,5 +85,5 @@ libjasper_la_LIBADD = \ - - # -release $(LT_RELEASE) - libjasper_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -+ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - diff -rup jasper-1.900.1.orig/src/libjasper/Makefile.in jasper-1.900.1.new/src/libjasper/Makefile.in --- jasper-1.900.1.orig/src/libjasper/Makefile.in 2007-01-19 16:54:45.000000000 -0500 +++ jasper-1.900.1.new/src/libjasper/Makefile.in 2008-09-09 10:08:43.000000000 -0400 diff --git a/jasper/mingw32-jasper.spec b/jasper/mingw32-jasper.spec index af758b5..8896784 100644 --- a/jasper/mingw32-jasper.spec +++ b/jasper/mingw32-jasper.spec @@ -6,7 +6,7 @@ Name: mingw32-jasper Version: 1.900.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW Windows Jasper library License: JasPer @@ -16,15 +16,17 @@ URL: http://www.ece.uvic.ca/~mdadams/jasper/ Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip # Patches from Fedora native package. -Patch1: jasper-1.701.0-GL.patch +# OpenGL is disabled in this build, so we don't need this patch: +#Patch1: jasper-1.701.0-GL.patch # Note patch2 appears in native package, but is not applied: #Patch2: jasper-1.701.0-GL-ac.patch Patch3: patch-libjasper-stepsizes-overflow.diff # MinGW-specific patches. +# This patch adds '-no-undefined' flag to libtool line: Patch1000: jasper-1.900.1-mingw32.patch +# This patch is a bit of a hack, but it's just there to fix a demo program: Patch1001: jasper-1.900.1-sleep.patch -Patch1002: jasper-1.900.1-enable-shared.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,7 +36,6 @@ BuildRequires: mingw32-gcc BuildRequires: mingw32-binutils BuildRequires: mingw32-libjpeg BuildRequires: mingw32-dlfcn -BuildRequires: autoconf %description @@ -43,17 +44,15 @@ MinGW Windows Jasper library. %prep %setup -q -n jasper-%{version} -%patch1 -p1 -b .GL %patch3 -p1 -b .CVE-2007-2721 %patch1000 -p1 -b .mingw32 %patch1001 -p1 -b .sleep -%patch1002 -p1 -b .shared %build -autoconf -%{_mingw32_configure} --disable-opengl --enable-libjpeg --disable-static +%{_mingw32_configure} \ + --disable-opengl --enable-libjpeg --disable-static --enable-shared make %{?_smp_mflags} @@ -72,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYRIGHT LICENSE NEWS README %{_mingw32_bindir}/i686-pc-mingw32-imgcmp.exe %{_mingw32_bindir}/i686-pc-mingw32-imginfo.exe @@ -85,6 +84,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 9 2009 Richard W.M. Jones - 1.900.1-8 +- Fix defattr line. +- Remove the enable-shared patch, and just use --enable-shared on + the configure line. +- Disable the GL patch since OpenGL is disabled. +- Document what the patches are for in the spec file. +- Only patch Makefile.in so we don't have to rerun autotools, and + remove autotools dependency. + * Fri Feb 20 2009 Richard W.M. Jones - 1.900.1-7 - Rebuild for mingw32-gcc 4.4 -- 1.8.3.1