diff --git a/.gitignore b/.gitignore index 5559919..a953b31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libwps-0.2.0.tar.gz /libwps-0.2.2.tar.gz +/libwps-0.2.3.tar.gz diff --git a/libwps-0.2.0-werror.patch b/libwps-0.2.0-werror.patch deleted file mode 100644 index 4084a75..0000000 --- a/libwps-0.2.0-werror.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur libwps-0.2.0.orig/configure libwps-0.2.0/configure ---- libwps-0.2.0.orig/configure 2010-11-16 11:50:59.000000000 +0100 -+++ libwps-0.2.0/configure 2011-06-28 11:27:23.118458784 +0200 -@@ -15185,8 +15185,8 @@ - - else - if test x"$GCC" = xyes; then -- CFLAGS="$CFLAGS -Wall -Werror -pedantic" -- CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic" -+: CFLAGS="$CFLAGS -Wall -Werror -pedantic" -+: CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic" - fi - fi - -diff -Naur libwps-0.2.0.orig/configure.in libwps-0.2.0/configure.in ---- libwps-0.2.0.orig/configure.in 2008-04-14 09:55:28.000000000 +0200 -+++ libwps-0.2.0/configure.in 2011-06-28 11:27:42.786743535 +0200 -@@ -202,8 +202,8 @@ - - else - if test x"$GCC" = xyes; then -- CFLAGS="$CFLAGS -Wall -Werror -pedantic" -- CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic" -+: CFLAGS="$CFLAGS -Wall -Werror -pedantic" -+: CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic" - fi - fi - diff --git a/libwps.spec b/libwps.spec index 11968fc..a7cf474 100644 --- a/libwps.spec +++ b/libwps.spec @@ -1,5 +1,5 @@ Name: libwps -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Summary: Library for reading and converting Microsoft Works word processor documents @@ -7,8 +7,6 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://libwps.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Remove -Werror from CFLAGS/CXXFLAGS -Patch0: %{name}-0.2.0-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -57,12 +55,11 @@ The %{name}-doc package contains documentation files for %{name} %prep %setup -q -%patch0 -p1 # Prevent autotools from being rerun touch -r aclocal.m4 configure configure.in %build -%configure --disable-static +%configure --disable-static --disable-werror 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} @@ -94,7 +91,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc CHANGES COPYING CREDITS README +%doc COPYING CREDITS NEWS README %{_libdir}/*.so.* %files devel @@ -116,6 +113,10 @@ rm -rf %{buildroot} %changelog +* Fri Nov 18 2011 David Tardon - 0.2.3-1 +- latest version +- remove obsoleted patch + * Wed Jul 13 2011 David Tardon - 0.2.2-1 - latest version diff --git a/sources b/sources index c49a4ae..bb9101a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38169166f932579caf7dbe501f31e070 libwps-0.2.2.tar.gz +ef653c60ee9a06975876f4e75e4e49fa libwps-0.2.3.tar.gz