rpms/canorus/devel canorus-linking.patch, NONE, 1.1 canorus.spec, 1.2, 1.3
Orcan Ogetbil
oget at fedoraproject.org
Mon May 31 01:43:53 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/canorus/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6328
Modified Files:
canorus.spec
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)
############################
# RtMIDI Library additions #
Index: canorus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/canorus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- canorus.spec 31 May 2010 00:47:54 -0000 1.2
+++ canorus.spec 31 May 2010 01:43:53 -0000 1.3
@@ -8,7 +8,7 @@
Name: canorus
Summary: Music Score Editor
Version: 0.7
-Release: 5.%{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
@@ -32,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
@@ -71,6 +73,7 @@ cross-platformability.
%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
@@ -172,6 +175,9 @@ 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
More information about the scm-commits
mailing list