diff --git a/djvulibre-3.5.25.3-cflags.patch b/djvulibre-3.5.25.3-cflags.patch new file mode 100644 index 0000000..e2b7c5f --- /dev/null +++ b/djvulibre-3.5.25.3-cflags.patch @@ -0,0 +1,51 @@ +diff -up djvulibre-3.5.25/configure~ djvulibre-3.5.25/configure +--- djvulibre-3.5.25/configure~ 2012-05-08 05:56:53.000000000 +0300 ++++ djvulibre-3.5.25/configure 2012-10-10 00:01:36.000000000 +0300 +@@ -14733,6 +14733,7 @@ fi + + OPTS= + ++if false; then + saved_CXXFLAGS="$CXXFLAGS" + saved_CFLAGS="$CFLAGS" + CXXFLAGS= +@@ -14750,6 +14751,7 @@ fi + *) CFLAGS="$CFLAGS $opt" ;; + esac + done ++fi + if test x$ac_debug = xno ; then + OPTS=-DNDEBUG + +@@ -14770,6 +14772,7 @@ $as_echo "no" >&6; } + fi + + ++if false; then + opt="-O3" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts $opt" >&5 + $as_echo_n "checking if $CXX accepts $opt... " >&6; } +@@ -14801,6 +14804,7 @@ $as_echo "no" >&6; } + fi + + fi ++fi + + + opt="-Wno-non-virtual-dtor" +@@ -14819,6 +14823,7 @@ $as_echo "no" >&6; } + + fi + ++if false; then + cpu=`uname -m 2>/dev/null` + test -z "$cpu" && cpu=${host_cpu} + case "${host_cpu}" in +@@ -14860,6 +14865,7 @@ $as_echo "no" >&6; } + + ;; + esac ++fi + else + + opt="-Wall" diff --git a/djvulibre.spec b/djvulibre.spec index 79b2758..581bc03 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,12 +1,13 @@ Summary: DjVu viewers, encoders, and utilities Name: djvulibre Version: 3.5.25.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz Patch0: djvulibre-3.5.22-cdefs.patch +Patch1: djvulibre-3.5.25.3-cflags.patch Requires(post): xdg-utils Requires(preun): xdg-utils @@ -58,6 +59,7 @@ Development files for DjVuLibre. %prep %setup -q -n %{name}-3.5.25 %patch0 -p1 -b .cdefs +%patch1 -p1 -b .cflags %build @@ -66,7 +68,6 @@ Development files for DjVuLibre. #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} OPTS="%{optflags}" make %{?_smp_mflags} V=1 @@ -166,6 +167,9 @@ fi %changelog +* Tue Oct 9 2012 Ville Skyttä - 3.5.25.3-2 +- Build with $RPM_OPT_FLAGS (#729469). + * Wed Oct 3 2012 Jonathan G. Underwood - 3.5.25.3-1 - Update to version 3.5.25.3 - Add BuildRequires for inkscape