[packages/quadra] up to 1.2.0; disable svgalib

glen glen at pld-linux.org
Tue Mar 5 10:37:52 CET 2013


commit c635392155f96863c6019066aee1959087cf9fb9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 5 11:30:55 2013 +0200

    up to 1.2.0; disable svgalib

 quadra-DESTDIR.patch | 29 -----------------------------
 quadra.spec          | 39 +++++++++++++++++++--------------------
 2 files changed, 19 insertions(+), 49 deletions(-)
---
diff --git a/quadra.spec b/quadra.spec
index a27bf75..d94cc84 100644
--- a/quadra.spec
+++ b/quadra.spec
@@ -1,21 +1,21 @@
-#
+# TODO
+# - fix format-security"
+
 # Conditional build:
-%bcond_without	svga	# without svgalib version
-#
-Summary:	Multiplayer puzzle game
+%bcond_with	svga	# without svgalib version
+
+Summary:	Multiplayer Action Puzzle Game
 Summary(pl.UTF-8):	Gra logiczna dla wielu graczy
 Name:		quadra
-Version:	1.1.8
-Release:	3
-License:	GPL
+Version:	1.2.0
+Release:	0.1
+License:	LGPL v2.1
 Group:		X11/Applications/Games
-Source0:	http://dl.sourceforge.net/quadra/%{name}-%{version}.tar.gz
-# Source0-md5:	4934ee30d0bd98c4c454829a03224f6f
+Source0:	http://quadra.googlecode.com/files/%{name}-%{version}.tar.gz
+# Source0-md5:	df179970c4eb75af9ccdc5527d901fa6
 Source1:	%{name}.desktop
 Source2:	http://www.gamesdomain.com/faqdir/%{name}.txt
-Patch0:		%{name}-DESTDIR.patch
-URL:		http://quadra.sourceforge.net/
-BuildRequires:	XFree86-devel
+URL:		http://code.google.com/p/quadra/
 BuildRequires:	autoconf
 BuildRequires:	libpng-devel
 %{?with_svga:BuildRequires:	svgalib-devel}
@@ -66,9 +66,9 @@ Sterownik svgalib dla gry Quadra.
 
 %prep
 %setup -q
-%patch0
 
 %build
+CPPFLAGS="%{rpmcflags} -Wno-error=format-security"
 %{__autoconf}
 %configure \
 	%{!?with_svga:--without-svgalib}
@@ -80,23 +80,22 @@ Sterownik svgalib dla gry Quadra.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install images/quadra.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p images/quadra.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README quadra.txt
-%attr(755,root,root) %{_bindir}/*
+%doc NEWS README ChangeLog quadra.txt
+%attr(755,root,root) %{_bindir}/quadra
 %{_datadir}/games/quadra.res
-%{_pixmapsdir}/*
-%{_desktopdir}/*.desktop
+%{_pixmapsdir}/quadra.xpm
+%{_desktopdir}/quadra.desktop
 
 %if %{with svga}
 %files svga
diff --git a/quadra-DESTDIR.patch b/quadra-DESTDIR.patch
deleted file mode 100644
index 9b87fef..0000000
--- a/quadra-DESTDIR.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- config/rules.mk~	Thu Oct 11 23:40:31 2001
-+++ config/rules.mk	Mon Aug  5 19:40:06 2002
-@@ -39,18 +39,18 @@
- 	-cvs2cl.pl
- 
- installdirs:
--	mkdir -p $(bindir)
--	mkdir -p $(libgamesdir)
--	mkdir -p $(datagamesdir)
--	mkdir -p $(datadir)/pixmaps
-+	mkdir -p $(DESTDIR)$(bindir)
-+	mkdir -p $(DESTDIR)$(libgamesdir)
-+	mkdir -p $(DESTDIR)$(datagamesdir)
-+	mkdir -p $(DESTDIR)$(datadir)/pixmaps
- 
- install: installdirs $(TARGETS)
--	$(INSTALL_PROGRAM) quadra $(bindir)/quadra
-+	$(INSTALL_PROGRAM) quadra $(DESTDIR)$(bindir)/quadra
- ifdef UGS_LINUX_SVGA
--	$(INSTALL_PROGRAM) quadra-svga.so $(libgamesdir)/quadra-svga.so
-+	$(INSTALL_PROGRAM) quadra-svga.so $(DESTDIR)$(libgamesdir)/quadra-svga.so
- endif
--	$(INSTALL_DATA) quadra.res $(datagamesdir)/quadra.res
--	$(INSTALL_DATA) images/quadra.xpm $(datadir)/pixmaps/quadra.xpm
-+	$(INSTALL_DATA) quadra.res $(DESTDIR)$(datagamesdir)/quadra.res
-+	$(INSTALL_DATA) images/quadra.xpm $(DESTDIR)$(datadir)/pixmaps/quadra.xpm
- # FIXME: the Quadra.desktop file should go to these places:
- # /etc/X11/applnk/Games/Quadra.desktop
- # /usr/share/gnome/apps/Games/Quadra.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/quadra.git/commitdiff/bb7e13982c8d4f548fe6eed1db963da1e8c39ad5



More information about the pld-cvs-commit mailing list