rpms/stage/F-11 stage-3.2.2.fixcmake64.patch, 1.1, 1.2 stage.spec, 1.1, 1.2

[rmattes]

Author: rmattes

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

Modified Files:
	stage-3.2.2.fixcmake64.patch stage.spec 
Log Message:
* Sun Mar 14 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-7
- Merged -doc subpackage into -devel
- Added Requires pkgconfig entries


stage-3.2.2.fixcmake64.patch:
 CMakeLists.txt                          |   11 ++++++++---
 cmake/internal/FindOS.cmake             |   23 +++++++++++++++++++++++
 examples/ctrl/CMakeLists.standalone.txt |    2 +-
 examples/ctrl/CMakeLists.txt            |    2 +-
 libstage/CMakeLists.txt                 |    2 +-
 stage.pc.in                             |    4 ++--
 worlds/benchmark/CMakeLists.txt         |    2 +-
 7 files changed, 37 insertions(+), 9 deletions(-)

Index: stage-3.2.2.fixcmake64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/stage/F-11/stage-3.2.2.fixcmake64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- stage-3.2.2.fixcmake64.patch	16 Mar 2010 02:59:25 -0000	1.1
+++ stage-3.2.2.fixcmake64.patch	16 Mar 2010 18:01:17 -0000	1.2
@@ -30,7 +30,7 @@ diff -up ./cmake/internal/FindOS.cmake.f
 +MESSAGE(STATUS "Installing Libraries to ${PROJECT_LIB_DIR}")
 diff -up ./CMakeLists.txt.fixcmake64 ./CMakeLists.txt
 --- ./CMakeLists.txt.fixcmake64	2010-01-17 19:27:56.000000000 -0500
-+++ ./CMakeLists.txt	2010-03-10 17:54:25.000000000 -0500
++++ ./CMakeLists.txt	2010-03-14 13:23:11.000000000 -0400
 @@ -40,9 +40,9 @@ ENDIF (NOT PROJECT_OS_WIN AND NOT PROJEC
  
  #####################################
@@ -43,7 +43,19 @@ diff -up ./CMakeLists.txt.fixcmake64 ./C
  
  #####################################
  # Set the default build type
-@@ -186,7 +186,7 @@ ENDIF( WEBSIM_FOUND )
+@@ -140,6 +140,11 @@ STRING(REGEX REPLACE "\n" ";" FLTK_LIBS 
+ #MESSAGE( STATUS "    FLTK_LDFLAGS = ${FLTK_LDFLAGS}")
+ #MESSAGE( STATUS "    FLTK_LIBS = ${FLTK_LIBS}")
+ 
++STRING(REGEX REPLACE " -lGLU" "" TMP "${FLTK_LDFLAGS}")
++STRING(REGEX REPLACE " -lGL" "" TMP2 "${TMP}")
++STRING(REGEX REPLACE " -lpng" "" FLTK_LDFLAGS_PKGCONFIG "${TMP2}")
++
++
+ SET (FLTK_FOUND TRUE)
+ 
+ # ENDIF( BUILD_GUI )
+@@ -186,7 +191,7 @@ ENDIF( WEBSIM_FOUND )
  
  # Create the pkgconfig file
  CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage.pc.in ${CMAKE_CURRENT_BINARY_DIR}/stage.pc @ONLY)
@@ -86,13 +98,15 @@ diff -up ./libstage/CMakeLists.txt.fixcm
  INSTALL(FILES stage.hh 
 diff -up ./stage.pc.in.fixcmake64 ./stage.pc.in
 --- ./stage.pc.in.fixcmake64	2009-10-28 16:48:05.000000000 -0400
-+++ ./stage.pc.in	2010-01-17 19:28:32.000000000 -0500
-@@ -4,5 +4,5 @@ Name: stage
++++ ./stage.pc.in	2010-03-14 13:11:28.000000000 -0400
+@@ -3,6 +3,6 @@ prefix=@CMAKE_INSTALL_PREFIX@
+ Name: stage
  Description: Stage robot simulation program, C++ library and Player plugin - part of the Player/Stage Project
  Version: @VERSION@
- Requires: 
+-Requires: 
 -Libs: -L${prefix}/lib -lstage @FLTK_LDFLAGS@
-+Libs: -L${prefix}/@PROJECT_LIB_DIR@ -lstage @FLTK_LDFLAGS@
++Requires: glu libpng
++Libs: -L${prefix}/@PROJECT_LIB_DIR@ -lstage @FLTK_LDFLAGS_PKGCONFIG@
  Cflags: -I${prefix}/include/Stage- at APIVERSION@ @FLTK_CFLAGS@ 
 diff -up ./worlds/benchmark/CMakeLists.txt.fixcmake64 ./worlds/benchmark/CMakeLists.txt
 --- ./worlds/benchmark/CMakeLists.txt.fixcmake64	2010-01-17 19:41:56.000000000 -0500


Index: stage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stage/F-11/stage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- stage.spec	16 Mar 2010 02:59:25 -0000	1.1
+++ stage.spec	16 Mar 2010 18:01:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           stage
 Version:        3.2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A 2.5D multi-robot simulator
 
 Group:          Applications/Engineering
@@ -63,21 +63,12 @@ This package contains the Stage plug-in 
 stage-playerplugin allows Stage models to be exposed as Player interfaces,
 and manipulated through the Player server.
 
-%package doc
-Summary: Extra html documentation for Stage
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description doc
-Comprehensive html documentation for the Stage programming API.
-
 %prep
 %setup -q -n Stage-%{version}-Source
-%patch0 -p1 -b .fixcmake64
-%patch1 -p1 -b .fixlibload
-%patch2 -p1 -b .fixexamples
-%patch3 -p1 -b .fixdso
+%patch0 -p1 
+%patch1 -p1 
+%patch2 -p1 
+%patch3 -p1 
 
 
 %build
@@ -125,15 +116,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc docsrc/html
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/Stage-3.2
 
-%files doc
-%defattr(-,root,root,-)
-%doc docsrc/html
 
 %changelog
+* Sun Mar 14 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-7
+- Merged -doc subpackage into -devel
+- Added Requires pkgconfig entries
+
 * Wed Mar 10 2010 Rich Mattes <richmattes at gmail.com> - 3.2.2-6
 - Remove conflicting compiler flags