[rpms/vym] epel10: Upgrade to 1.10.0, new patches from Till Maas.

[rpms/vym] epel10: Upgrade to 1.10.0, new patches from Till Maas.

[Jon Ciesla]

A new commit has been pushed.

Repo   : rpms/vym
Branch : epel10
Commit : a1e8c22b702e92f9c9ecaa001a058f8f47b8a3b9
Author : Jon Ciesla <limb@fedoraproject.org>
Date   : 2007-10-24T18:31:59+00:00
Stats  : +149/-13 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/vym/c/a1e8c22b702e92f9c9ecaa001a058f8f47b8a3b9?branch=epel10

Log:
Upgrade to 1.10.0, new patches from Till Maas.

---
diff --git a/.cvsignore b/.cvsignore
index 2815776..550f2fe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vym-1.8.1.tar.gz
+vym-1.10.0.tar.bz2

diff --git a/sources b/sources
index f55839c..940b4f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de461aef063a3a3a528669715611257e  vym-1.8.1.tar.gz
+188f08f2e0af5e122e2613351f3b92d9  vym-1.10.0.tar.bz2

diff --git a/vym-1.10.0-dir-vars.patch b/vym-1.10.0-dir-vars.patch
new file mode 100644
index 0000000..5b6d403
--- /dev/null
+++ b/vym-1.10.0-dir-vars.patch
@@ -0,0 +1,60 @@
+Author: Till Maas <opensource till name>
+License: same as vym
+
+Define more variables to make it easier to configure the path where
+the parts of vym should be installed, e.g. the prefix (PREFIX is imho
+more ofen used than INSTALLDIR) and DOCDIR.
+
+diff -up vym-1.10.0/vym.pro.dir-vars vym-1.10.0/vym.pro
+--- vym.pro	2007-07-30 11:47:12.000000000 +0200
++++ vym.pro	2007-10-18 21:55:44.000000000 +0200
+@@ -121,26 +121,42 @@ TRANSLATIONS += lang/vym_en.ts
+ TRANSLATIONS += lang/vym_es.ts
+ TRANSLATIONS += lang/vym_it.ts
+ 
+-count( INSTALLDIR, 0 ) {
+-	INSTALLDIR = /usr/local
++isEmpty( PREFIX ) {
++	PREFIX = /usr/local
++	count( INSTALLDIR, 1 ) {
++		PREFIX = $${INSTALLDIR}
++		message( "Please use PREFIX instead of INSTALLDIR" )
++	}
++}
++isEmpty( BINDIR ) {
++	BINDIR = $${PREFIX}/bin
++}
++isEmpty( DATADIR ) {
++	DATADIR = $${PREFIX}/share
++}
++isEmpty( DOCDIR ) {
++	DOCDIR = $${DATADIR}/doc/packages/vym
++}
++isEmpty( DEMODIR ) {
++	DEMODIR = $${DOCDIR}
+ }
+ 
+ message( "Installation directory" )
+-message( $$INSTALLDIR )
++message( $$PREFIX )
+ 
+ 
+-target.path = $${INSTALLDIR}/bin
++target.path = $${BINDIR}
+ INSTALLS += target
+ 
+ support.files = styles/ scripts/ icons/ flags/ lang/ macros/ exports/
+-support.path = $${INSTALLDIR}/share/vym
++support.path = $${DATADIR}/vym
+ INSTALLS += support 
+ 
+ doc.files = tex/vym.pdf 
+-doc.path = $${INSTALLDIR}/share/doc/packages/vym
++doc.path = $${DOCDIR}
+ INSTALLS += doc
+ 
+ demo.files = demos/
+-demo.path = $${INSTALLDIR}/share/doc/packages/vym
++demo.path = $${DEMODIR}
+ INSTALLS += demo
+ 

diff --git a/vym-1.10.0-docdir-searchList.patch b/vym-1.10.0-docdir-searchList.patch
new file mode 100644
index 0000000..1a9a69e
--- /dev/null
+++ b/vym-1.10.0-docdir-searchList.patch
@@ -0,0 +1,34 @@
+Author: Till Maas <opensource till name>
+License: same as vym
+
+Add the used DOCDIR when building vym to the searchList when searching the
+pdf with the documentation.
+
+diff -up vym-1.10.0/vym.pro.docdir-searchList vym-1.10.0/vym.pro
+--- vym.pro	2007-10-18 23:43:25.000000000 +0200
++++ vym.pro	2007-10-18 23:43:25.000000000 +0200
+@@ -152,9 +152,10 @@ support.files = styles/ scripts/ icons/ 
+ support.path = $${DATADIR}/vym
+ INSTALLS += support 
+ 
+-doc.files = tex/vym.pdf 
++doc.files = tex/vym.pdf
+ doc.path = $${DOCDIR}
+ INSTALLS += doc
++DEFINES += VYM_DOCDIR=\\\"$${DOCDIR}\\\"
+ 
+ demo.files = demos/
+ demo.path = $${DEMODIR}
+diff -up vym-1.10.0/mainwindow.cpp.docdir-searchList vym-1.10.0/mainwindow.cpp
+--- mainwindow.cpp	2007-09-04 15:53:33.000000000 +0200
++++ mainwindow.cpp	2007-10-18 23:44:51.000000000 +0200
+@@ -3629,6 +3629,9 @@ void Main::helpDoc()
+ 	#if defined(Q_OS_MACX)
+ 		searchList << "./vym.app/Contents/Resources/doc";
+ 	#else
++		#if defined(VYM_DOCDIR)
++			searchList << VYM_DOCDIR;
++		#endif
+ 		// default path in SUSE LINUX
+ 		searchList <<"/usr/share/doc/packages/vym";
+ 	#endif

diff --git a/vym-1.10.0-xdg-open.patch b/vym-1.10.0-xdg-open.patch
new file mode 100644
index 0000000..6cd599a
--- /dev/null
+++ b/vym-1.10.0-xdg-open.patch
@@ -0,0 +1,27 @@
+Author: Till Maas <opensource till name>
+License: same as vym
+
+This makes vym use xdg-open instead of konqueror or acroread by default to
+open an URL or a PDF-document.
+
+diff -up vym-1.10.0/mainwindow.cpp.xdg-open vym-1.10.0/mainwindow.cpp
+--- mainwindow.cpp	2007-10-18 23:36:22.000000000 +0200
++++ mainwindow.cpp	2007-10-18 23:38:02.000000000 +0200
+@@ -135,7 +135,7 @@ Main::Main(QWidget* parent, const char* 
+ 		// application to open URLs
+ 		p="/mainwindow/readerURL";
+ 		#if defined(Q_OS_LINUX)
+-			s=settings.value (p,"konqueror").toString();
++			s=settings.value (p,"xdg-open").toString();
+ 		#else
+ 			#if defined(Q_OS_MACX)
+ 				s=settings.value (p,"/usr/bin/open").toString();
+@@ -148,7 +148,7 @@ Main::Main(QWidget* parent, const char* 
+ 		// application to open PDFs
+ 		p="/mainwindow/readerPDF";
+ 		#if defined(Q_OS_LINUX)
+-			s=settings.value (p,"acroread").toString();
++			s=settings.value (p,"xdg-open").toString();
+ 		#else
+ 			#if defined(Q_OS_MACX)
+ 				s=settings.value (p,"/usr/bin/open").toString();

diff --git a/vym.spec b/vym.spec
index d099922..2e59a23 100644
--- a/vym.spec
+++ b/vym.spec
@@ -1,19 +1,19 @@
 Name:           vym
-Version:        1.8.1
-Release:        9%{?dist}
+Version:        1.10.0
+Release:        1%{?dist}
 Summary:        View your mind
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.insilmaril.de/vym/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
-Patch0:         %{name}-mainwindow.patch
-Patch1:         %{name}-pro.patch
-Patch2:         %{name}-tex.patch
+Patch0:         vym-1.10.0-dir-vars.patch
+Patch1:         vym-1.10.0-docdir-searchList.patch
+Patch2:         vym-1.10.0-xdg-open.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel libXext-devel desktop-file-utils kdelibs
+BuildRequires:  qt4-devel libXext-devel desktop-file-utils
 
 %description
 VYM (View Your Mind) is a tool to generate and manipulate maps
@@ -23,12 +23,14 @@ to organize tasks, to get an overview over complex contexts.
 
 %prep
 %setup -q
+
 %patch0
 %patch1
 %patch2
 
 %build
-qmake INSTALLDIR=%{buildroot}%{_prefix}
+
+qmake-qt4 INSTALLDIR=%{buildroot}%{_prefix}
 
 %{__make} %{?_smp_mflags}
 
@@ -56,7 +58,7 @@ desktop-file-install --vendor fedora               \
 
 
 ## File lists
-# locale's
+# locales
 %find_lang %{name} || touch %{name}.lang
 
 %clean
@@ -77,33 +79,46 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc LICENSE demos/ doc/*
+%doc LICENSE.txt README.txt INSTALL.txt demos/* doc/*
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}*
 %{_datadir}/icons/hicolor/48x48/apps/%{name}*
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%exclude %{_datadir}/doc/packages/
 
 %changelog
+* Thu Oct 18 2007 Jon Ciesla <limb@jcomserv.net> - 1.10.0-1
+- Upgrade to 1.10.0.
+- Applied several patches from Till Maas, which he sent upstream.
+
 * Thu Aug 16 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-9
 - License tag correction.
+
 * Wed Mar 21 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-8
 - Converted patches to unified output format.
+
 * Wed Mar 21 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-7
 - Dropped symlink in favor of path patches.
+
 * Wed Mar 21 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-6
 - Fixed Source URL.
+
 * Tue Mar 20 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-5
 - doc link fix, icon fix.
+
 * Mon Mar 19 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-4
 - Fixed Desktop icon path, make copy timestamps, cleaned scripts.
 - Added symlink to fix PDF location.
+
 * Tue Mar 13 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-3
 - Fixed source url.
 - added desktop-file-utils,kdelibs BRs.
 - Fixed desktop file handling.
+
 * Tue Mar 13 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-2
 - Submitting for review.
+
 * Wed Nov 22 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 1.8.1-1
-- Initial Package.
\ No newline at end of file
+- Initial Package.