rpms/qascade/devel Makefile, 1.3, 1.4 qascade-dblsep.patch, 1.2, 1.3 qascade.desktop, 1.3, 1.4 qascade.spec, 1.9, 1.10 sources, 1.3, 1.4

Jon Ciesla (limb) fedora-extras-commits at redhat.com
Fri Mar 2 13:36:29 UTC 2007


Author: limb

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

Added Files:
	Makefile qascade-dblsep.patch qascade.desktop qascade.spec 
	sources 
Log Message:
auto-import qascade-0.1-6 on branch devel from qascade-0.1-6.src.rpm


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	2 Mar 2007 13:35:56 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: qascade
+# $Id$
+NAME := qascade
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

qascade-dblsep.patch:

Index: qascade-dblsep.patch
===================================================================
RCS file: qascade-dblsep.patch
diff -N qascade-dblsep.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qascade-dblsep.patch	2 Mar 2007 13:35:56 -0000	1.3
@@ -0,0 +1,10 @@
+--- 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: qascade.desktop
diff -N qascade.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qascade.desktop	2 Mar 2007 13:35:56 -0000	1.4
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qascade
+Comment=Classic puzzle game
+Exec=qascade
+Icon=qascade
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Categories=Application;Game;PuzzleGame;Qt;


Index: qascade.spec
===================================================================
RCS file: qascade.spec
diff -N qascade.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qascade.spec	2 Mar 2007 13:35:56 -0000	1.10
@@ -0,0 +1,92 @@
+Name:           qascade
+Version:        0.1
+Release:        6%{?dist}
+Summary:        Classic puzzle game
+
+Group:          Amusements/Games
+License:        GPL
+URL:            http://www.bitsnpieces.org.uk/qascade/
+Source0:        http://www.bitsnpieces.org.uk/qascade/%{name}-%{version}.tar.bz2
+Source1:        %{name}.desktop
+Patch0:         %{name}-dblsep.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  qt-devel
+BuildRequires:  desktop-file-utils
+
+%description
+Qascade is a port of the simple yet addictive and enjoyable puzzle
+game that came with the Psion Revo PDA.
+
+
+%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
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+%makeinstall
+desktop-file-install \
+  --vendor fedora \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --mode 644 \
+  --add-category X-Fedora \
+  %{SOURCE1}
+install -D -p -m 644 %{name}.hscr \
+  $RPM_BUILD_ROOT%{_localstatedir}/lib/games/%{name}.hscr
+install -D -p -m 644 blue.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/qascade.png
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc *.htm
+%attr(2755,root,games) %{_bindir}/%{name}
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/icons/hicolor/24x24/apps/qascade.png
+%attr(0664,games,games) %config(noreplace) %{_localstatedir}/lib/games/%{name}*
+
+
+%changelog
+* Fri Mar 02 2007 Jon Ciesla <limb at jcomserv.net> - 0.1-6
+- Rebuild for FC-6 and devel.  Will need cleanup but should work.
+
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1-5
+- Rebuild.
+
+* Thu Nov  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.1-4
+- Clean up build dependencies.
+- Drop workaround for #150528.
+- Install icon to %%{_datadir}/icons/hicolor, update GTK icon cache.
+
+* 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.
+
+* Sun Aug  3 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.1-0.fdr.1
+- First build.
+


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	2 Mar 2007 13:35:56 -0000	1.4
@@ -0,0 +1 @@
+13e8ca4230da1bee7c9e1c861490da62  qascade-0.1.tar.bz2




More information about the scm-commits mailing list