rpms/pianobooster/F-12 pianobooster-0.6.4b-explicit-linking.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 pianobooster.spec, 1.4, 1.5 sources, 1.3, 1.4

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/pianobooster/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5918

Modified Files:
	.cvsignore pianobooster.spec sources 
Added Files:
	pianobooster-0.6.4b-explicit-linking.patch 
Log Message:
* Fri May 07 2010 Christian Krause <chkr at fedoraproject.org> - 0.6.4b-3
- Update to new upstream version 0.6.4b (fixes BZ 571030)
- Fix permission problem on source files in debuginfo package
- Link libpthread and libGL explicitly


pianobooster-0.6.4b-explicit-linking.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE pianobooster-0.6.4b-explicit-linking.patch ---
diff -uNr pianobooster-src-0.6.4b.old/src/CMakeLists.txt pianobooster-src-0.6.4b/src/CMakeLists.txt
--- pianobooster-src-0.6.4b.old/src/CMakeLists.txt	2009-11-27 22:25:35.000000000 +0100
+++ pianobooster-src-0.6.4b/src/CMakeLists.txt	2010-05-06 05:47:22.000000000 +0200
@@ -57,6 +57,8 @@
     #IF(ALSA_FOUND)
         ADD_DEFINITIONS(-D__LINUX_ALSASEQ__)
         LINK_LIBRARIES (asound)
+    LINK_LIBRARIES (pthread)
+    LINK_LIBRARIES (GL)
     #ELSE(ALSA_FOUND)
     #    MESSAGE(FATAL_ERROR "Please install the 'libasound2-dev' package and then try again")
     #ENDIF(ALSA_FOUND)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	6 Dec 2009 14:25:12 -0000	1.3
+++ .cvsignore	7 May 2010 04:33:05 -0000	1.4
@@ -1 +1 @@
-pianobooster-src-0.6.4.tar.gz
+pianobooster-src-0.6.4b.tar.gz


Index: pianobooster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-12/pianobooster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pianobooster.spec	6 Dec 2009 14:25:12 -0000	1.4
+++ pianobooster.spec	7 May 2010 04:33:05 -0000	1.5
@@ -1,12 +1,14 @@
 Name:            pianobooster
 Summary:         A MIDI file player that teaches you how to play the piano
-Version:         0.6.4
+Version:         0.6.4b
 Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Multimedia
 URL:             http://pianobooster.sourceforge.net/
 Source0:         http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
 Source1:         %{name}.desktop
+# link libpthread and libGL explicitly
+Patch0:          pianobooster-0.6.4b-explicit-linking.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:   cmake
 BuildRequires:   qt4-devel
@@ -26,6 +28,7 @@ MIDI keyboard.
 
 %prep
 %setup -q -n %{name}-src-%{version}
+%patch0 -p1 -b .linkpthread
 
 sed -e 's|\r||g' README.txt > README.txt.tmp
 touch -r README.txt README.txt.tmp
@@ -35,6 +38,8 @@ sed -e 's|\r||g' license.txt > license.t
 touch -r license.txt license.txt.tmp
 mv license.txt.tmp license.txt
 
+find -name '*.cpp' -exec chmod a-x {} \;
+find -name '*.h' -exec chmod a-x {} \;
 
 %build
 pushd build
@@ -83,6 +88,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri May 07 2010 Christian Krause <chkr at fedoraproject.org> - 0.6.4b-1
+- Update to new upstream version 0.6.4b (fixes BZ 571030)
+- Fix permission problem on source files in debuginfo package
+- Link libpthread and libGL explicitly
+
 * Sun Dec 06 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.4-1
 - Update to new upstream version 0.6.4
 - Fix icon permissions


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pianobooster/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	6 Dec 2009 14:25:12 -0000	1.3
+++ sources	7 May 2010 04:33:05 -0000	1.4
@@ -1 +1 @@
-af1bb513c93ac7b1c8cc919b60146d1c  pianobooster-src-0.6.4.tar.gz
+4c1c34a4b763e6108aa9668be7890696  pianobooster-src-0.6.4b.tar.gz