rpms/vym/EL-5 vym-0.10.0-editxlinkdialog-typeinfo.patch, NONE, 1.1 vym-0.10.0-mainwindow-typeinfo.patch, NONE, 1.1 vym-0.10.0-selection-typeinfo.patch, NONE, 1.1 vym-0.10.0-xml-vym-typeinfo.patch, NONE, 1.1 vym-1.10.0-ornamentedobj-typeinfo.patch, NONE, 1.1 vym-mainwindow.patch, 1.2, 1.3 vym-pro.patch, 1.2, 1.3 vym-tex.patch, 1.2, 1.3 vym.xml, NONE, 1.1 vym.spec, 1.8, 1.9
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Thu Jun 12 18:56:04 UTC 2008
Author: limb
Update of /cvs/pkgs/rpms/vym/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057
Modified Files:
vym.spec
Added Files:
vym-0.10.0-editxlinkdialog-typeinfo.patch
vym-0.10.0-mainwindow-typeinfo.patch
vym-0.10.0-selection-typeinfo.patch
vym-0.10.0-xml-vym-typeinfo.patch
vym-1.10.0-ornamentedobj-typeinfo.patch vym-mainwindow.patch
vym-pro.patch vym-tex.patch vym.xml
Log Message:
BZ 434929.
vym-0.10.0-editxlinkdialog-typeinfo.patch:
--- NEW FILE vym-0.10.0-editxlinkdialog-typeinfo.patch ---
--- editxlinkdialog.cpp 2008-01-09 13:38:11.000000000 -0600
+++ editxlinkdialog.cpp 2008-01-09 13:38:11.000000000 -0600
@@ -1,6 +1,7 @@
#include "editxlinkdialog.h"
#include <QColorDialog>
+#include <typeinfo>
EditXLinkDialog::EditXLinkDialog (QWidget *parent):QDialog (parent)
{
vym-0.10.0-mainwindow-typeinfo.patch:
--- NEW FILE vym-0.10.0-mainwindow-typeinfo.patch ---
--- mainwindow.cpp~ 2008-01-09 13:40:12.000000000 -0600
+++ mainwindow.cpp 2008-01-09 13:40:12.000000000 -0600
@@ -3,6 +3,7 @@
#include <QtGui>
#include <iostream>
+#include <typeinfo>
#include "aboutdialog.h"
#include "branchpropwindow.h"
vym-0.10.0-selection-typeinfo.patch:
--- NEW FILE vym-0.10.0-selection-typeinfo.patch ---
--- selection.cpp 2008-01-09 13:39:27.000000000 -0600
+++ selection.cpp 2008-01-09 13:39:27.000000000 -0600
@@ -2,7 +2,7 @@
#include "mainwindow.h"
#include "mapeditor.h"
-
+#include <typeinfo>
extern Main *mainWindow;
vym-0.10.0-xml-vym-typeinfo.patch:
--- NEW FILE vym-0.10.0-xml-vym-typeinfo.patch ---
--- xml-vym.cpp 2008-01-09 13:37:09.000000000 -0600
+++ xml-vym.cpp 2008-01-09 13:37:09.000000000 -0600
@@ -4,6 +4,7 @@
#include <QColor>
#include <QTextStream>
#include <iostream>
+#include <typeinfo>
#include "misc.h"
#include "settings.h"
vym-1.10.0-ornamentedobj-typeinfo.patch:
--- NEW FILE vym-1.10.0-ornamentedobj-typeinfo.patch ---
--- ornamentedobj.cpp 2008-01-09 13:43:37.000000000 -0600
+++ ornamentedobj.cpp 2008-01-09 13:43:37.000000000 -0600
@@ -2,6 +2,7 @@
#include "texteditor.h"
#include "mapeditor.h"
#include "linkablemapobj.h"
+#include <typeinfo>
extern TextEditor *textEditor;
extern FlagRowObj *systemFlagsDefault;
vym-mainwindow.patch:
Index: vym-mainwindow.patch
===================================================================
RCS file: vym-mainwindow.patch
diff -N vym-mainwindow.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vym-mainwindow.patch 12 Jun 2008 18:55:12 -0000 1.3
@@ -0,0 +1,20 @@
+--- mainwindow.cpp 2007-03-21 10:31:33.000000000 -0500
++++ mainwindow.cpp 2007-03-21 10:36:12.000000000 -0500
+@@ -2764,7 +2764,7 @@
+ docpath="./vym.app/Contents/vym.pdf";
+ #else
+ // default path in SUSE LINUX
+- docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
++ docpath="/usr/share/doc/vym-1.8.1/doc/vym.pdf";
+ #endif
+
+ if (!QFile (docpath).exists() )
+@@ -2778,7 +2778,7 @@
+ if (!QFile (docpath).exists() )
+ {
+ // Try yet another one for Knoppix
+- docpath="/usr/share/doc/packages/vym/vym.pdf";
++ docpath="/usr/share/doc/vym-1.8.1/vym.pdf";
+ if (!QFile (docpath).exists() )
+ {
+ QMessageBox::critical(0,
vym-pro.patch:
Index: vym-pro.patch
===================================================================
RCS file: vym-pro.patch
diff -N vym-pro.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vym-pro.patch 12 Jun 2008 18:55:12 -0000 1.3
@@ -0,0 +1,16 @@
+--- vym.pro 2007-03-21 10:31:33.000000000 -0500
++++ vym.pro 2007-03-21 10:36:44.000000000 -0500
+@@ -101,11 +101,11 @@
+ INSTALLS += support
+
+ doc.files = tex/vym.pdf
+-doc.path = $${INSTALLDIR}/share/doc/packages/vym
++doc.path = $${INSTALLDIR}/share/doc/vym-1.8.1
+ INSTALLS += doc
+
+ demo.files = demos/
+-demo.path = $${INSTALLDIR}/share/doc/packages/vym
++demo.path = $${INSTALLDIR}/share/doc/vym-1.8.1
+ INSTALLS += demo
+
+ exports.files = exports/
vym-tex.patch:
Index: vym-tex.patch
===================================================================
RCS file: vym-tex.patch
diff -N vym-tex.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vym-tex.patch 12 Jun 2008 18:55:12 -0000 1.3
@@ -0,0 +1,20 @@
+--- tex/vym.tex 2007-03-21 10:31:32.000000000 -0500
++++ tex/vym.tex 2007-03-21 10:38:28.000000000 -0500
+@@ -500,7 +500,7 @@
+ paste it from your browser). Examples for valid paths are:
+ \begin{verbatim}
+ http://www.insilmaril.de/vym/index.html
+- file:/usr/share/doc/packages/vym/doc/vym.pdf
++ file:/usr/share/doc/vym-1.8.1/doc/vym.pdf
+ \end{verbatim}
+ If an URL was entered, a little globe will appear in the branch. By
+ clicking on the globe in the toolbar or the context menu an external
+@@ -1117,7 +1117,7 @@
+ Together with \vym you should have received a directory with several
+ maps e.g. on SUSE~LINUX this is
+ \begin{center}
+- {\tt /usr/share/doc/packages/vym/demos}
++ {\tt /usr/share/doc/vym-1.8.1/demos}
+ \end{center}
+ where you find the map {\tt todo.vym}. It lists quite a lot of things to
+ be done in future. If you have more ideas, contact the development team
--- NEW FILE vym.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-vym">
<sub-class-of type="application/zip"/>
<comment>View Your Mind file</comment>
<glob pattern="*.vym"/>
</mime-type>
</mime-info>
Index: vym.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vym/EL-5/vym.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vym.spec 18 Feb 2008 21:27:31 -0000 1.8
+++ vym.spec 12 Jun 2008 18:55:12 -0000 1.9
@@ -1,6 +1,6 @@
Name: vym
Version: 1.10.0
-Release: 1%{?dist}.3
+Release: 4%{?dist}
Summary: View your mind
Group: Applications/Productivity
@@ -8,10 +8,16 @@
URL: http://www.insilmaril.de/vym/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
+Source2: vym.xml
Patch0: vym-1.10.0-dir-vars.patch
Patch1: vym-1.10.0-docdir-searchList.patch
Patch2: vym-1.10.0-xdg-open.patch
-Patch3: vym-1.10.0-qt42.patch
+Patch3: vym-0.10.0-editxlinkdialog-typeinfo.patch
+Patch4: vym-0.10.0-selection-typeinfo.patch
+Patch5: vym-0.10.0-mainwindow-typeinfo.patch
+Patch6: vym-0.10.0-xml-vym-typeinfo.patch
+Patch7: vym-1.10.0-ornamentedobj-typeinfo.patch
+Patch8: vym-1.10.0-qt42.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel libXext-devel desktop-file-utils
@@ -28,7 +34,13 @@
%patch0
%patch1
%patch2
-%patch3 -p1
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p1
+
%build
@@ -58,6 +70,8 @@
%{__cp} -p icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{__cp} -p icons/%{name}-editor.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}-editor.png
+install -m a+rx,u+w -d %{buildroot}%{_datadir}/mime/packages
+install -p -m a+r,u+w %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/vym.xml
%clean
%{__rm} -rf %{buildroot}
@@ -67,6 +81,8 @@
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
+update-desktop-database &> /dev/null || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
@@ -74,6 +90,7 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+update-desktop-database &> /dev/null || :
%files
%defattr(-,root,root,-)
@@ -84,8 +101,12 @@
%{_datadir}/icons/hicolor/16x16/apps/%{name}*
%{_datadir}/icons/hicolor/48x48/apps/%{name}*
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+%{_datadir}/mime/packages/vym.xml
%changelog
+* Tue Jun 10 2008 Jon Ciesla <limb at jcomserv.net> - 1.10.0-4
+- Added mime type xml, BZ434929.
+
* Mon Feb 18 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1.10.0-1.3
- Try to fix build on 64bit
More information about the fedora-extras-commits
mailing list