commit 9a5bc9c18b5951d16f8d5e9d2e5e77972b64cfc4
Author: Jakub Bogusz <[email protected]>
Date: Sat Jan 9 23:39:03 2016 +0100
- updated to 3.5.27
- updated opt patch
djvulibre-opt.patch | 68 ++++++++++++++++++++---------------------------------
djvulibre.spec | 23 +++++++++---------
2 files changed, 37 insertions(+), 54 deletions(-)
---
diff --git a/djvulibre.spec b/djvulibre.spec
index 9894e2e..e07c1c6 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -1,25 +1,21 @@
# TODO: use system qt qt.qm files instead of included copies
-#
-# Conditional build:
-%define base_ver 3.5.25
-%define minor_ver .3
-#
Summary: DjVu viewers, encoders and utilities
Summary(pl.UTF-8): DjVu - przeglądarki, dekodery oraz narzędzia
Name: djvulibre
-Version: %{base_ver}%{minor_ver}
-Release: 4
+Version: 3.5.27
+Release: 1
License: GPL v2+
Group: Applications/Graphics
Source0: http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
-# Source0-md5: 5f45d6cd5700b4dd31b1eb963482089b
+# Source0-md5: aa4ed331f669f5a72e3c0d7f9196c4e6
Patch0: %{name}-opt.patch
Patch1: djvulibre-3.5.22-cdefs.patch
URL: http://djvu.sourceforge.net/
BuildRequires: autoconf >= 2.65
-BuildRequires: automake
+BuildRequires: automake >= 1.6
BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel
+BuildRequires: libtiff-devel
BuildRequires: libtool >= 2:2
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.357
@@ -87,7 +83,7 @@ Header files for DjVu library.
Pliki nagłówkowe biblioteki DjVu.
%prep
-%setup -q -n %{name}-%{base_ver}
+%setup -q
%patch0 -p1
%patch1 -p1
@@ -95,9 +91,12 @@ Pliki nagłówkowe biblioteki DjVu.
%{__libtoolize}
%{__aclocal} -I config
%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
PTHREAD_LIBS="-lpthread" \
- --disable-desktopfiles
+ --disable-desktopfiles \
+ --disable-silent-rules
%{__make} -j1
@@ -115,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYRIGHT NEWS README doc/*
+%doc COPYRIGHT NEWS README doc/{*.djvu,*.txt,*.pdf}
%attr(755,root,root) %{_bindir}/any2djvu
%attr(755,root,root) %{_bindir}/bzz
%attr(755,root,root) %{_bindir}/c44
diff --git a/djvulibre-opt.patch b/djvulibre-opt.patch
index 3e24818..f58b196 100644
--- a/djvulibre-opt.patch
+++ b/djvulibre-opt.patch
@@ -1,50 +1,34 @@
-diff -aurN djvulibre-3.5.17.orig/config/acinclude.m4
djvulibre-3.5.17/config/acinclude.m4
---- djvulibre-3.5.17.orig/config/acinclude.m4 2006-02-22 00:16:17.000000000
+0100
-+++ djvulibre-3.5.17/config/acinclude.m4 2006-05-16 19:04:01.600526896
+0200
-@@ -79,46 +79,6 @@
+--- djvulibre-3.5.27/config/acinclude.m4.orig 2016-01-09 21:49:51.852007828
+0100
++++ djvulibre-3.5.27/config/acinclude.m4 2016-01-09 22:38:16.038552615
+0100
+@@ -90,31 +90,8 @@
[ac_debug=$enableval],[ac_debug=no])
- OPTS=
- AC_SUBST(OPTS)
-- saved_CXXFLAGS="$CXXFLAGS"
-- saved_CFLAGS="$CFLAGS"
-- CXXFLAGS=
-- CFLAGS=
-- for opt in $saved_CXXFLAGS ; do
-- case $opt in
-- -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
-- -O*) ;;
-- *) CXXFLAGS="$CXXFLAGS $opt" ;;
-- esac
-- done
-- for opt in $saved_CFLAGS ; do
-- case $opt in
-- -O*|-g*) ;;
-- *) CFLAGS="$CFLAGS $opt" ;;
-- esac
-- done
-- if test x$ac_debug = xno ; then
-- OPTS=-DNDEBUG
-- AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"])
-- AC_CHECK_CXX_OPT([-O3],[OPTS="$OPTS -O3"],
-- [ AC_CHECK_CXX_OPT([-O2], [OPTS="$OPTS -O2"] ) ] )
-- dnl This triggers compiler bugs with gcc-3.2.2:
-- dnl AC_CHECK_CXX_OPT([-funroll-loops], [OPTS="$OPTS -funroll-loops"])
-- dnl QT3 has plenty of this:
-- AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor],[OPTS="$OPTS
-Wno-non-virtual-dtor"])
+ defines=
+ if test x$ac_debug = xno ; then
+- AC_REMOVE_OPTIONS([CFLAGS],[-O*])
+- AC_REMOVE_OPTIONS([CXXFLAGS],[-O*])
+- if test x$GCC != xyes ; then
+- AC_REMOVE_OPTIONS([CFLAGS],[-g*])
+- AC_REMOVE_OPTIONS([CXXFLAGS],[-g*])
+- fi
+ defines="-DNDEBUG"
+- AC_CHECK_CC_OPT([-O3],,[AC_CHECK_CC_OPT([-O2])])
+- AC_CHECK_CXX_OPT([-O3],,[AC_CHECK_CXX_OPT([-O2])])
- cpu=`uname -m 2>/dev/null`
- test -z "$cpu" && cpu=${host_cpu}
- case "${host_cpu}" in
- i?86)
- opt="-mtune=${host_cpu}"
-- AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"],
-- [ opt="-mcpu=${host_cpu}"
-- AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"]) ])
+- AC_CHECK_CXX_OPT([-mtune=${host_cpu}],,
+- [AC_CHECK_CXX_OPT([-mcpu=${host_cpu}])])
+- AC_CHECK_CC_OPT([-mtune=${host_cpu}],,
+- [AC_CHECK_CC_OPT([-mcpu=${host_cpu}])])
- ;;
- esac
-- else
-- AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"])
-- AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor],[OPTS="$OPTS
-Wno-non-virtual-dtor"])
-- fi
- case x"$ac_debug" in
- changequote(<<, >>)dnl
- x[0-9]) OPTS="$OPTS -DDEBUGLVL=$ac_debug" ;;
+ else
+- AC_REMOVE_OPTIONS([CFLAGS],[-O*|-g*])
+- AC_REMOVE_OPTIONS([CXXFLAGS],[-O*|-g*])
+- AC_CHECK_CC_OPT([-g])
+- AC_CHECK_CXX_OPT([-g])
+ AC_CHECK_CXX_OPT([-Wno-non-virtual-dtor])
+ fi
+ AC_CHECK_CC_OPT([-Wall])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/djvulibre.git/commitdiff/9a5bc9c18b5951d16f8d5e9d2e5e77972b64cfc4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
