rpms/vym/F-8 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.xml, NONE, 1.1 vym.desktop, 1.1, 1.2 vym.spec, 1.3, 1.4
Jon Ciesla (limb)
fedora-extras-commits at redhat.com
Thu Jun 12 18:39:35 UTC 2008
Author: limb
Update of /cvs/pkgs/rpms/vym/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24293
Modified Files:
vym.desktop 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.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;
--- 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.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/vym/F-8/vym.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vym.desktop 21 Mar 2007 18:24:07 -0000 1.1
+++ vym.desktop 12 Jun 2008 18:38:40 -0000 1.2
@@ -2,8 +2,9 @@
Encoding=UTF-8
Name=Vym
Comment=View your mind
-Exec=vym
-Icon=vym.png
+Exec=vym %f
+Icon=vym
+MimeType=application/x-vym;application/zip;
Terminal=false
Type=Application
Categories=Qt;KDE;Office;
Index: vym.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vym/F-8/vym.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vym.spec 8 Nov 2007 17:26:53 -0000 1.3
+++ vym.spec 12 Jun 2008 18:38:40 -0000 1.4
@@ -1,6 +1,6 @@
Name: vym
Version: 1.10.0
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: View your mind
Group: Applications/Productivity
@@ -8,9 +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-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
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel libXext-devel desktop-file-utils
@@ -27,6 +34,11 @@
%patch0
%patch1
%patch2
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
%build
@@ -56,6 +68,9 @@
%{__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}
@@ -65,6 +80,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 || :
@@ -72,6 +89,7 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+update-desktop-database &> /dev/null || :
%files
%defattr(-,root,root,-)
@@ -82,8 +100,18 @@
%{_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.
+
+* Fri Feb 08 2008 Jon Ciesla <limb at jcomserv.net> - 1.10.0-3
+- GCC 4.3 rebuild.
+
+* Wed Jan 09 2008 Jon Ciesla <limb at jcomserv.net> - 1.10.0-2
+- Added typeinfo patches.
+
* Thu Oct 18 2007 Jon Ciesla <limb at jcomserv.net> - 1.10.0-1
- Upgrade to 1.10.0.
- Applied several patches from Till Maas, which he sent upstream.
More information about the fedora-extras-commits
mailing list