rpms/canorus/F-13 canorus-linking.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 canorus.spec, 1.1, 1.2 sources, 1.2, 1.3

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/canorus/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8870

Modified Files:
	.cvsignore canorus.spec sources 
Added Files:
	canorus-linking.patch 
Log Message:
* Sun May 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-6.R1213.20100530svn
- Fix DSO linking


canorus-linking.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE canorus-linking.patch ---
diff -rupN canorus-0.7.old/src/CMakeLists.txt canorus-0.7/src/CMakeLists.txt
--- canorus-0.7.old/src/CMakeLists.txt	2010-05-27 20:08:07.000000000 -0400
+++ canorus-0.7/src/CMakeLists.txt	2010-05-30 21:25:00.000000000 -0400
@@ -611,7 +611,7 @@ ENDIF(USE_PYTHON)
 # command. Never remove that line :-)
 # Add ${QT_QTTEST_LIBRARY} below to add the Qt Test library as well
 # Add ${POPPLERQT4_LIBRARY} ${POPPLER_LIBRARY} to reactivate poppler libraries
-TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} )
+TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} pthread z)
 
 ############################
 # RtMIDI Library additions #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 18:10:38 -0000	1.2
+++ .cvsignore	31 May 2010 02:29:00 -0000	1.3
@@ -1 +1 @@
-canorus_0.7svn.R1177_source-FE.tar.bz2
+canorus_0.7svn.R1213_source-FE.tar.bz2


Index: canorus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-13/canorus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- canorus.spec	22 Sep 2009 18:10:38 -0000	1.1
+++ canorus.spec	31 May 2010 02:29:01 -0000	1.2
@@ -1,11 +1,14 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global svnrev R1177
-%global svndate .20090904svn
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
+%global svnrev R1213
+%global svndate .20100530svn
 
 Name:          canorus
 Summary:       Music Score Editor
 Version:       0.7
-Release:       4.%{svnrev}%{svndate}%{?dist}
+Release:       6.%{svnrev}%{svndate}%{?dist}
 Group:         Applications/Editors
 # rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
 # The rest of the source code, as explicitly indicated by upstream, is GPLv2
@@ -14,12 +17,11 @@ License:       GPLv2 and Public Domain
 URL:           http://canorus.berlios.de/
 # The original source tarball contains content files that have
 # unknown and possibly nonfree licenses we remove those bits from the tarball.
-# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
-# tar jxf canorus_*.tar.bz2
+# svn export http://svn.berlios.de/svnroot/repos/canorus/trunk canorus-0.7
 # rm -fr canorus-*/examples/{midi,musicxml}
 ## This next one is non-commercial use only. So remove...
 # rm -fr canorus-*/examples/come_again.can
-# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
+# tar jcf canorus_0.7svn.R1213_source-FE.tar.bz2 canorus-*
 Source0:       canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
 # The following patches are Fedora specific and not sent upstream:
 # Remove duplicate copies of docs that are already going to %%doc
@@ -30,6 +32,8 @@ Patch1:        %{name}-system-fonts.patc
 Patch2:        %{name}-python-dir.patch
 # No need to create directories outside the buildroot
 Patch3:        %{name}-destdir.patch
+# Fix DSO linking
+Patch4:        %{name}-linking.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -64,11 +68,12 @@ more! Using a Qt4 framework Canorus offe
 cross-platformability.
 
 %prep
-%setup -q -n %{name}-%{version}svn.%{svnrev}
+%setup -q
 %patch0 -p1 -b .noextradocs
 %patch1 -p1 -b .fonts
 %patch2 -p1 -b .python
 %patch3 -p1 -b .destdir
+%patch4 -p1 -b .linking
 
 # Remove bundled copy of zlib
 rm -fr src/zlib
@@ -170,6 +175,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun May 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-6.R1213.20100530svn
+- Fix DSO linking
+
+* Sun May 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-5.R1213.20100530svn
+- SVN revision 1213
+
 * Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
 - SVN revision 1177 (how come is this different from the last snapshot?)
 - Fix compilation flags


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 18:10:38 -0000	1.2
+++ sources	31 May 2010 02:29:01 -0000	1.3
@@ -1 +1 @@
-8d375719c70345a563aa8ca51a31920d  canorus_0.7svn.R1177_source-FE.tar.bz2
+fb24a2280de0c010d31e4a5689a0bbd1  canorus_0.7svn.R1213_source-FE.tar.bz2