Author: qboosh Date: Sun Dec 18 20:02:43 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- more BRs
- include COPYING in doc (copyright and license notes, not actual LGPL text)
- adjusted as-needed patch (but no success, cmake fault)
---- Files affected:
packages/libprojectM:
as-needed.patch (1.1 -> 1.2) , libprojectM.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/libprojectM/as-needed.patch
diff -u packages/libprojectM/as-needed.patch:1.1
packages/libprojectM/as-needed.patch:1.2
--- packages/libprojectM/as-needed.patch:1.1 Wed Jul 7 09:21:33 2010
+++ packages/libprojectM/as-needed.patch Sun Dec 18 21:02:38 2011
@@ -5,7 +5,7 @@
endif(BUILD_PROJECTM_STATIC)
-TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m
${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS}
${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m dl
${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS}
${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
++TARGET_LINK_LIBRARIES(projectM-shared ${PRESET_FACTORY_LINK_TARGETS}
${GLEW_LINK_TARGETS} m dl ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}
${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS})
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in"
"${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" @ONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in"
"${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY)
================================================================
Index: packages/libprojectM/libprojectM.spec
diff -u packages/libprojectM/libprojectM.spec:1.19
packages/libprojectM/libprojectM.spec:1.20
--- packages/libprojectM/libprojectM.spec:1.19 Thu Nov 17 20:53:22 2011
+++ packages/libprojectM/libprojectM.spec Sun Dec 18 21:02:38 2011
@@ -19,7 +19,7 @@
Version: 2.0.1
Release: 6
Epoch: 1
-License: LGPL
+License: LGPL v2.1+
Group: Libraries
Source0:
http://downloads.sourceforge.net/project/projectm/%{version}/projectM-%{version}-Source.tar.gz
# Source0-md5: f8bf795878cdbbef54784cf2390b4c89
@@ -32,9 +32,14 @@
Patch6: 04-change-preset-duration.patch
Patch7: 06-fix-numeric-locale.patch
URL: http://projectm.sourceforge.net/
-BuildRequires: cmake
+BuildRequires: OpenGL-devel
+BuildRequires: cmake >= 2.6.0
+BuildRequires: freetype-devel >= 2.0
BuildRequires: ftgl-devel >= 2.1.3
+BuildRequires: gcc-c++ >= 6:4.2
BuildRequires: glew-devel
+BuildRequires: libgomp-devel
+BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.577
BuildRequires: sed >= 4.0
@@ -112,7 +117,8 @@
%files
%defattr(644,root,root,755)
-%doc ChangeLog
+# COPYING is just license information, not actual LGPL text
+%doc COPYING ChangeLog
%attr(755,root,root) %{_libdir}/libprojectM.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libprojectM.so.2
%dir %{_datadir}/%{pkgname}
@@ -140,6 +146,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2011/12/18 20:02:38 qboosh
+- more BRs
+- include COPYING in doc (copyright and license notes, not actual LGPL text)
+- adjusted as-needed patch (but no success, cmake fault)
+
Revision 1.19 2011/11/17 19:53:22 arekm
- release 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libprojectM/as-needed.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libprojectM/libprojectM.spec?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
