From b07b23cabc94d0d2f5a5129672625f67bb10934ba1f5e3730825e8fc36299554 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 13 Jul 2007 18:27:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/djvulibre?expand=0&rev=6 --- djvulibre-3.5.19-semicolon.patch | 11 +++++++ djvulibre.changes | 7 +++++ djvulibre.spec | 51 +++++++++++++++++++++++++++++--- 3 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 djvulibre-3.5.19-semicolon.patch diff --git a/djvulibre-3.5.19-semicolon.patch b/djvulibre-3.5.19-semicolon.patch new file mode 100644 index 0000000..a767a47 --- /dev/null +++ b/djvulibre-3.5.19-semicolon.patch @@ -0,0 +1,11 @@ +--- desktopfiles/djvulibre-djview3.desktop ++++ desktopfiles/djvulibre-djview3.desktop +@@ -2,7 +2,7 @@ + Encoding=UTF-8 + Type=Application + Categories=Qt;Graphics +-MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu ++MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu; + Name=DjView3 + Exec=djview3 %f + Terminal=false diff --git a/djvulibre.changes b/djvulibre.changes index a27d13e..988d0a5 100644 --- a/djvulibre.changes +++ b/djvulibre.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 13 17:27:13 CEST 2007 - lmichnovic@suse.cz + +- added trailing semicolon in desktop file (semicolon.patch) +- splitted off djview3 (Qt3) to make possible have alternative + djview4 (Qt4) package + ------------------------------------------------------------------- Mon Jun 11 17:45:08 CEST 2007 - lmichnovic@suse.cz diff --git a/djvulibre.spec b/djvulibre.spec index 39492e8..9ffda07 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -12,11 +12,11 @@ Name: djvulibre BuildRequires: libdrm-devel libjpeg-devel libtiff-devel qt3-devel qt3-devel-tools update-desktop-files xorg-x11-devel -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Graphics/Other Autoreqprov: on Version: 3.5.19 -Release: 27 +Release: 32 # The following is a kludge to get updating djvulibre to after the split work PreReq: libdjvulibre15 URL: http://djvu.sourceforge.net @@ -25,6 +25,7 @@ Source: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-nsdejavu.patch Patch2: %{name}-%{version}-filepath.patch Patch3: %{name}-%{version}-strip.patch +Patch4: %{name}-%{version}-semicolon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,6 +43,24 @@ Web sites around the world. +Authors: +-------- + Dr Bill C Riemers + Leon Bottou + Yann LeCun + +%package djview3 +Summary: DjView3 is a portable DjVu Qt3 based viewer and browser plugin +Group: Productivity/Graphics/Other +Requires: djvulibre = %{version} +Conflicts: djvulibre-djview4 + +%description djview3 +DjView3 is a viewer and browser plugin for DjVu documents, based on the +DjVuLibre-3.5 library and the Qt3 toolkit. + + + Authors: -------- Dr Bill C Riemers @@ -84,6 +103,7 @@ Authors: %patch1 %patch2 %patch3 +%patch4 # removing cvsignore files in version 3.5.19 rm -rf doc/minilisp/.cvsignore @@ -100,7 +120,8 @@ QT_LIBS="-L/usr/%_lib/qt3/%{_lib} -lqt-mt" \ --x-includes=/usr/include/ \ --x-libraries=/usr/%{_lib}/ \ --with-qt=/usr/%_lib/qt3 -make OPTS="$RPM_OPT_FLAGS -Wall -fmessage-length=0 -DNO_DEBUG" +make OPTS="$RPM_OPT_FLAGS -Wall -fmessage-length=0 -DNO_DEBUG" +#%{?jobs:-j%jobs} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -137,7 +158,6 @@ exit 0 %doc %{_mandir}/ja/* %{_datadir}/djvu %{_bindir}/* -%{_libdir}/browser-plugins/nsdejavu.so #%{_datadir}/icons/* #%{_datadir}/pixmaps/djvu3.png %dir %{_prefix}/share/icons/hicolor @@ -151,7 +171,26 @@ exit 0 %{_prefix}/share/icons/hicolor/22x22/mimetypes/djvu.png %{_prefix}/share/icons/hicolor/32x32/mimetypes/djvu.png %{_prefix}/share/icons/hicolor/48x48/mimetypes/djvu.png +# these go to djview3 subpackage +%exclude %{_prefix}/share/pixmaps/djvulibre-djview3.png +%exclude %{_libdir}/browser-plugins/nsdejavu.so +%exclude %{_datadir}/djvu/djview3 +%exclude %{_bindir}/djview* +%exclude %doc %{_mandir}/man1/djview* +%exclude %doc %{_mandir}/ja/man1/djview* +%exclude %doc %{_mandir}/man1/nsdejavu* +%exclude %doc %{_mandir}/ja/man1/nsdejavu* + +%files djview3 +%defattr(-,root,root) +%doc %{_mandir}/man1/djview* +%doc %{_mandir}/ja/man1/djview* +%doc %{_mandir}/man1/nsdejavu* +%doc %{_mandir}/ja/man1/nsdejav* %{_prefix}/share/pixmaps/djvulibre-djview3.png +%{_datadir}/djvu/djview3 +%{_libdir}/browser-plugins/nsdejavu.so +%{_bindir}/djview* %files -n libdjvulibre15 %defattr(-,root,root) @@ -168,6 +207,10 @@ exit 0 %{_libdir}/pkgconfig/ddjvuapi.pc %changelog +* Fri Jul 13 2007 - lmichnovic@suse.cz +- added trailing semicolon in desktop file (semicolon.patch) +- splitted off djview3 (Qt3) to make possible have alternative + djview4 (Qt4) package * Mon Jun 11 2007 - lmichnovic@suse.cz - fixed djvulibre-devel's Requires with %%{version}; [#282833] * Wed Jun 06 2007 - lmichnovic@suse.cz