From ff84a7887ff47fe2d03164f5bc4f7584ebcea246 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 11 Apr 2003 19:21:29 +0000 Subject: [PATCH] - updated to 3.5.10 - updated opt patch, removed obsolete DESTDIR patch Changed files: djvulibre-DESTDIR.patch -> 1.2 djvulibre-opt.patch -> 1.2 djvulibre.spec -> 1.16 --- djvulibre-DESTDIR.patch | 123 ---------------------------------------- djvulibre-opt.patch | 10 ++-- djvulibre.spec | 13 ++--- 3 files changed, 12 insertions(+), 134 deletions(-) delete mode 100644 djvulibre-DESTDIR.patch diff --git a/djvulibre-DESTDIR.patch b/djvulibre-DESTDIR.patch deleted file mode 100644 index 9e25b92..0000000 --- a/djvulibre-DESTDIR.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- ./gui/nsdejavu/Makefile.in.org Wed Jan 16 20:52:38 2002 -+++ ./gui/nsdejavu/Makefile.in Thu May 16 23:24:55 2002 -@@ -67,12 +67,12 @@ - install: install-bin install-man - - install-bin: ${NSDEJAVU} FORCE -- ${INSTALL} -d ${plugindir} -- ${INSTALL} -m 0644 ${NSDEJAVU} ${plugindir} -+ ${INSTALL} -d ${DESTDIR}${plugindir} -+ ${INSTALL} -m 0644 ${NSDEJAVU} ${DESTDIR}${plugindir} - - install-man: nsdejavu.1 FORCE -- ${INSTALL} -d ${mandir}/man1 -- ${INSTALL} -m 0644 nsdejavu.1 ${mandir}/man1 -+ ${INSTALL} -d ${DESTDIR}${mandir}/man1 -+ ${INSTALL} -m 0644 nsdejavu.1 ${DESTDIR}${mandir}/man1 - - depend: FORCE - ${CC} -MM ${CFLAGS} ${srcdir}/nsdejavu.c > Makefile.dep ---- ./gui/djview/Makefile.in.org Thu May 16 23:24:09 2002 -+++ ./gui/djview/Makefile.in Thu May 16 23:24:00 2002 -@@ -180,19 +180,19 @@ - install: install-bin install-man install-data - - install-bin: ${PROGRAM} FORCE -- ${INSTALL} -d ${bindir} -- ${INSTALL} -s -m 0755 ${PROGRAM} ${bindir} -+ ${INSTALL} -d ${DESTDIR}${bindir} -+ ${INSTALL} -s -m 0755 ${PROGRAM} ${DESTDIR}${bindir} - - install-man: FORCE -- ${INSTALL} -d ${mandir}/man1 -- ${INSTALL} -m 0644 ${srcdir}/djview.1 ${mandir}/man1 -+ ${INSTALL} -d ${DESTDIR}${mandir}/man1 -+ ${INSTALL} -m 0644 ${srcdir}/djview.1 ${DESTDIR}${mandir}/man1 - - install-data: FORCE -- ${INSTALL} -d ${datadir}/djvu/osi -+ ${INSTALL} -d ${DESTDIR}${datadir}/djvu/osi - -test -r ${srcdir}/djview_help.djvu && \ -- ${INSTALL} -m 0644 ${srcdir}/djview_help.djvu ${datadir}/djvu/osi -+ ${INSTALL} -m 0644 ${srcdir}/djview_help.djvu ${DESTDIR}${datadir}/djvu/osi - -test -r ${srcdir}/djview_help.html && \ -- ${INSTALL} -m 0644 ${srcdir}/djview_help.html ${datadir}/djvu/osi -+ ${INSTALL} -m 0644 ${srcdir}/djview_help.html ${DESTDIR}${datadir}/djvu/osi - - - depend: ${MOCINCS} FORCE ---- ./libdjvu/Makefile.in.org Thu May 16 23:15:27 2002 -+++ ./libdjvu/Makefile.in Thu May 16 23:17:47 2002 -@@ -99,15 +99,15 @@ - @RPO_YES@ ${CXX} ${CXXFLAGS} -o $@ $@.o ${OBJS} ${LIBS} - - install-data: FORCE -- ${INSTALL} -d ${datadir}/djvu -+ ${INSTALL} -d ${DESTDIR}${datadir}/djvu - for n in `cd ${top_srcdir}/share && find djvu -name '*.xml' -print` ; do \ - src="${top_srcdir}/share/$$n" ; dir="`dirname ${datadir}/$$n`" ;\ -- test -d $$dir || ${INSTALL} -d $$dir ; \ -- ${INSTALL} -m 0644 $$src $$dir || exit ; done -+ test -d ${DESTDIR}$$dir || ${INSTALL} -d ${DESTDIR}$$dir ; \ -+ ${INSTALL} -m 0644 $$src ${DESTDIR}$$dir || exit ; done - - install-lib: ${LIBDJVU_SO} FORCE -- ${INSTALL} -d ${libdir} -- ${INSTALL} -m 644 ${LIBDJVU_SO} ${libdir} -+ ${INSTALL} -d ${DESTDIR}${libdir} -+ ${INSTALL} -m 644 ${LIBDJVU_SO} ${DESTDIR}${libdir} - - depend: FORCE - ${CXX} -MM ${CXXFLAGS} ${srcdir}/*.cpp > Makefile.dep ---- ./xmltools/Makefile.in.org Thu May 16 23:19:47 2002 -+++ ./xmltools/Makefile.in Thu May 16 23:21:26 2002 -@@ -63,21 +63,21 @@ - install: install-bin install-data # install-man (disabled for now) - - install-bin: ${PROGRAMS} FORCE -- ${INSTALL} -d ${bindir} -+ ${INSTALL} -d ${DESTDIR}${bindir} - for n in ${PROGRAMS} ; do \ -- ${INSTALL} -s -m 0755 $$n ${bindir} || exit ; done -+ ${INSTALL} -s -m 0755 $$n ${DESTDIR}${bindir} || exit ; done - - install-data: FORCE -- ${INSTALL} -d ${datadir}/djvu -+ ${INSTALL} -d ${DESTDIR}${datadir}/djvu - for n in `cd ${top_srcdir}/share && find djvu -name '*.dtd' -print` ; do \ - src="${top_srcdir}/share/$$n" ; dir="`dirname ${datadir}/$$n`" ;\ -- test -d $$dir || ${INSTALL} -d $$dir ; \ -- ${INSTALL} -m 0644 $$src $$dir || exit ; done -+ test -d ${DESTDIR}$$dir || ${INSTALL} -d ${DESTDIR}$$dir ; \ -+ ${INSTALL} -m 0644 $$src ${DESTDIR}$$dir || exit ; done - - install-man: FORCE -- ${INSTALL} -d ${mandir}/man1 -+ ${INSTALL} -d ${DESTDIR}${mandir}/man1 - for n in ${srcdir}/*.1 ; do \ -- ${INSTALL} -m 0644 $$n ${mandir}/man1 || exit ; done -+ ${INSTALL} -m 0644 $$n ${DESTDIR}${mandir}/man1 || exit ; done - - depend: FORCE - ${CXX} -MM ${CXXFLAGS} ${srcdir}/*.cpp > Makefile.dep ---- ./tools/Makefile.in.org Thu May 16 23:19:02 2002 -+++ ./tools/Makefile.in Thu May 16 23:18:49 2002 -@@ -65,14 +65,14 @@ - install: install-bin install-man - - install-bin: ${PROGRAMS} FORCE -- ${INSTALL} -d ${bindir} -+ ${INSTALL} -d ${DESTDIR}${bindir} - for n in ${PROGRAMS} ; do \ -- ${INSTALL} -s -m 0755 $$n ${bindir} || exit ; done -+ ${INSTALL} -s -m 0755 $$n ${DESTDIR}${bindir} || exit ; done - - install-man: FORCE -- ${INSTALL} -d ${mandir}/man1 -+ ${INSTALL} -d ${DESTDIR}${mandir}/man1 - for n in ${srcdir}/*.1 ; do \ -- ${INSTALL} -m 0644 $$n ${mandir}/man1 || exit ; done -+ ${INSTALL} -m 0644 $$n ${DESTDIR}${mandir}/man1 || exit ; done - - depend: FORCE - ${CXX} -MM ${CXXFLAGS} ${srcdir}/*.cpp > Makefile.dep diff --git a/djvulibre-opt.patch b/djvulibre-opt.patch index cc69d6e..5de97f0 100644 --- a/djvulibre-opt.patch +++ b/djvulibre-opt.patch @@ -1,6 +1,6 @@ ---- djvulibre-3.5.5/config/acinclude.m4.orig Thu Mar 21 17:43:46 2002 -+++ djvulibre-3.5.5/config/acinclude.m4 Sat May 18 01:03:33 2002 -@@ -58,36 +58,6 @@ +--- djvulibre-3.5.10/config/acinclude.m4.orig Mon Jan 27 13:31:55 2003 ++++ djvulibre-3.5.10/config/acinclude.m4 Fri Apr 11 19:54:53 2003 +@@ -79,38 +79,6 @@ [ac_debug=$enableval],[ac_debug=no]) OPTS= AC_SUBST(OPTS) @@ -21,7 +21,7 @@ - *) CFLAGS="$CFLAGS $opt" ;; - esac - done -- if test $ac_debug = no ; then +- if test x$ac_debug = xno ; then - OPTS=-DNO_DEBUG - AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"]) - AC_CHECK_CXX_OPT([-O3],[OPTS="$OPTS -O3"], @@ -33,6 +33,8 @@ - AC_CHECK_CXX_OPT([$opt], [OPTS="$OPTS $opt"]) - ;; - esac +- else +- AC_CHECK_CXX_OPT([-Wall],[OPTS="$OPTS -Wall"]) - fi case x"$ac_debug" in x[0-9]) OPTS="$OPTS -DDEBUGLVL=$ac_debug" ;; diff --git a/djvulibre.spec b/djvulibre.spec index 298794f..b9fd385 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,14 +1,13 @@ Summary: DjVu viewers, encoders and utilities Summary(pl): DjVu - przegl±darki, dekodery oraz narzêdzia Name: djvulibre -Version: 3.5.9 -Release: 2 +Version: 3.5.10 +Release: 1 License: GPL Group: Applications/Graphics Source0: http://dl.sourceforge.net/djvu/%{name}-%{version}.tar.gz -Patch0: %{name}-DESTDIR.patch -Patch1: %{name}-opt.patch -Patch2: %{name}-nostrip.patch +Patch0: %{name}-opt.patch +Patch1: %{name}-nostrip.patch URL: http://djvu.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -116,12 +115,12 @@ Wtyczka DjVu do Netscape. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__aclocal} %{__autoconf} -# there are aliasing violations at least at libdjvu/BSByteStream.cpp:356-357, +# there are aliasing violations - at least at libdjvu/BSByteStream.cpp:356-357 +# (GPBuffer::GPBuffer casts unsigned int*& to void*&), # so -fno-strict-aliasing must be passed CXXFLAGS="%{rpmcflags} -fno-strict-aliasing" %configure -- 2.44.0