rpms/puzzles/F-11 0001-Adds-lX11-and-lm-to-the-libraries.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.2, 1.3 puzzles.spec, 1.3, 1.4 sources, 1.3, 1.4

[Victor Bogado da Silva Lins]

Author: bogado

Update of /cvs/pkgs/rpms/puzzles/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2618/F-11

Modified Files:
	.cvsignore import.log puzzles.spec sources 
Added Files:
	0001-Adds-lX11-and-lm-to-the-libraries.patch 
Log Message:
New upstream release.


0001-Adds-lX11-and-lm-to-the-libraries.patch:
 mkfiles.pl |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Adds-lX11-and-lm-to-the-libraries.patch ---
>From a17b97d1fb818c841a3121e5f7eaabdef17e3cf4 Mon Sep 17 00:00:00 2001
From: Victor Bogado <victor at bogado.net>
Date: Thu, 11 Mar 2010 16:49:35 -0300
Subject: [PATCH] Adds -lX11 and -lm to the libraries.

gtk.c uses XSetProperty that belongs in the X11 lib that was not included.
---
 mkfiles.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index 7f36f8f..e8a23cd 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1111,7 +1111,7 @@ if (defined $makefiles{'gtk'}) {
     &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
 	       " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
-    "XLIBS = `\$(GTK_CONFIG) --libs`\n".
+    "XLIBS = -lm -lX11 `\$(GTK_CONFIG) --libs`\n".
     "ULIBS =#\n".
     "INSTALL=install\n",
     "INSTALL_PROGRAM=\$(INSTALL)\n",
-- 
1.6.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/puzzles/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Jun 2009 02:35:08 -0000	1.3
+++ .cvsignore	11 Mar 2010 23:43:44 -0000	1.4
@@ -1 +1 @@
-puzzles-r8596.tar.gz
+puzzles-r8887.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/puzzles/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	23 Jun 2009 02:35:08 -0000	1.2
+++ import.log	11 Mar 2010 23:43:44 -0000	1.3
@@ -1,2 +1,3 @@
 puzzles-8373-1_bog10:HEAD:puzzles-8373-1.bog10.src.rpm:1229375587
 puzzles-8596-1_bog11:F-11:puzzles-8596-1.bog11.src.rpm:1245724461
+puzzles-8887-1_bog12:F-11:puzzles-8887-1.bog12.src.rpm:1268350987


Index: puzzles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/puzzles/F-11/puzzles.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- puzzles.spec	23 Jun 2009 02:35:08 -0000	1.3
+++ puzzles.spec	11 Mar 2010 23:43:44 -0000	1.4
@@ -1,5 +1,5 @@
 Name: puzzles
-Version: 8596
+Version: 8887
 Release: 1%{?dist}
 Summary: A collection of one-player puzzle games
 
@@ -8,6 +8,7 @@ License: MIT
 URL: http://www.chiark.greenend.org.uk/~sgtatham/puzzles/
 Source0: http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r%{version}.tar.gz
 Source1: template.desktop
+Patch0: 0001-Adds-lX11-and-lm-to-the-libraries.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, perl, desktop-file-utils
@@ -19,6 +20,11 @@ break from whatever else you were doing.
 
 %prep
 %setup -q -n puzzles-r%{version}
+%patch0 -p1
+
+# rebuilds the makefile with the patched mkfiles.pl
+./mkfiles.pl
+
 # uses the fedora command line instead of the one hardcoded in the makefile
 # -g is the last option that is not application specific. 
 # TODO: THIS IS UGLY, NEW VERSIONS COULD MAKE THIS STOP WORKING
@@ -68,7 +74,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-*Mon Jun 22 2009  Victor Bogado <victor at bogado.net> 8596-1
+* Thu Mar 11 2010  Victor Bogado <victor at bogado.net> 8887-1
+- Updating to a new upstream version
+- Fixing link DSO issue from bug #564620
+
+* Mon Jun 22 2009  Victor Bogado <victor at bogado.net> 8596-1
 - updating to a new upstream version
 
 *Thu Dec 11 2008  Victor Bogado <victor at bogado.net> 8365-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/puzzles/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Jun 2009 02:35:08 -0000	1.3
+++ sources	11 Mar 2010 23:43:44 -0000	1.4
@@ -1 +1 @@
-f943f5989182a845b1bef0d9bb0d7af2  puzzles-r8596.tar.gz
+ee2abcb8552db5e67b45354f019b6587  puzzles-r8887.tar.gz