devel/qascade qascade-dblsep.patch, NONE, 1.1 qascade.desktop, 1.1, 1.2 qascade.spec, 1.5, 1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/devel/qascade
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4216

Modified Files:
	qascade.desktop qascade.spec 
Added Files:
	qascade-dblsep.patch 
Log Message:
Work around #150528, other cosmetic tweaks.

qascade-dblsep.patch:

--- NEW FILE qascade-dblsep.patch ---
--- qascade_main.ui~	2003-05-03 02:04:13.000000000 +0300
+++ qascade_main.ui	2005-03-18 18:18:28.000000000 +0200
@@ -11149,7 +11149,6 @@
     <item text="&amp;File" name="fileMenu">
         <action name="fileNewAction"/>
         <separator/>
-        <separator/>
         <action name="fileExitAction"/>
     </item>
     <item text="View" name="PopupMenu">


Index: qascade.desktop
===================================================================
RCS file: /cvs/extras/devel/qascade/qascade.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qascade.desktop	8 Nov 2004 05:17:16 -0000	1.1
+++ qascade.desktop	18 Mar 2005 16:36:14 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Qascade
-Comment=QT port of classic puzzle game
+Comment=Classic puzzle game
 Exec=qascade
-Icon=qascade.png
+Icon=qascade
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;Game;PuzzleGame;QT;
+Categories=Application;Game;PuzzleGame;Qt;


Index: qascade.spec
===================================================================
RCS file: /cvs/extras/devel/qascade/qascade.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qascade.spec	4 Mar 2005 00:05:42 -0000	1.5
+++ qascade.spec	18 Mar 2005 16:36:14 -0000	1.6
@@ -1,13 +1,14 @@
 Name:           qascade
 Version:        0.1
-Release:        2
-Summary:        QT port of classic puzzle game
+Release:        3
+Summary:        Classic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.bitsnpieces.org.uk/qascade/
 Source0:        http://www.bitsnpieces.org.uk/qascade/qascade-0.1.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-dblsep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, XFree86-devel, desktop-file-utils
@@ -19,12 +20,14 @@
 
 %prep
 %setup -q
+%patch0
 
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 qmake INSTALL_ROOT=$RPM_BUILD_ROOT qascade.pro
 perl -pi -e 's|^(C(XX)?FLAGS\s*=.*)$|$1 \$(RPM_OPT_FLAGS)|g' Makefile
+perl -pi -e 's|^(UIC\s*=.*)|$1 -nounload|' Makefile # work around #150528
 make %{?_smp_mflags}
 
 
@@ -57,6 +60,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1-3
+- Add workaround for UIC segfault (#150528).
+- Various cosmetic desktop entry and UI tweaks.
+
 * Sun Aug 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1-0.fdr.2
 - Fix URL.
 - Ensure that QTDIR is also defined in %%install.