rpms/marble/F-8 marble-0.5-multilibs.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 marble.spec, 1.6, 1.7 sources, 1.5, 1.6

Mon Feb 4 18:27:00 UTC 2008

Author: chitlesh

Update of /cvs/pkgs/rpms/marble/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18810/F-8

Modified Files:
	.cvsignore marble.spec sources 
Added Files:
	marble-0.5-multilibs.patch 
Log Message:


marble-0.5-multilibs.patch:

--- NEW FILE marble-0.5-multilibs.patch ---
--- src/plugins/navigator/CMakeLists.txt	2007-12-31 12:34:26.000000000 +0100
+++ CMakeLists.txt_fedora	2008-02-04 18:49:21.000000000 +0100
@@ -37,4 +37,4 @@
   install(TARGETS MarbleNavigatorPlugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
 endif (QTONLY)
 
-set_target_properties(MarbleNavigatorPlugin PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE  SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
+set_target_properties(MarbleNavigatorPlugin PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE  SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_SUFFIX})


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/marble/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Aug 2007 13:36:21 -0000	1.5
+++ .cvsignore	4 Feb 2008 18:26:29 -0000	1.6
@@ -1 +1 @@
-marble-0.4-3.tar.bz2
+marble-0.5.1.tar.bz2


Index: marble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/marble/F-8/marble.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- marble.spec	27 Aug 2007 13:36:21 -0000	1.6
+++ marble.spec	4 Feb 2008 18:26:29 -0000	1.7
@@ -1,18 +1,17 @@
 Name:           marble
 
-#codename: Sladibadfast
-# upstream version: 0.4-3, but advised me to use:
-Version:        0.4.0.3
+Version:        0.5.1
 Release:        1%{?dist}
-Summary:        A KDE Desktop Globe
+Summary:        A KDE4 Desktop Globe
 
 Group:          Applications/Engineering
 License:        LGPLv2
 
 URL:            http://edu.kde.org/marble/
-Source0:        http://developer.kde.org/~tackat/marble/%{name}-0.4-3.tar.bz2
+Source0:        http://developer.kde.org/~tackat/marble/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         %{name}-0.5-multilibs.patch
 BuildRequires:  qt4-devel cmake desktop-file-utils gpsd-devel
 
 
@@ -38,12 +37,16 @@
 %prep
 %setup -q -n %{name}
 
-%build
+%patch -p0 -b .rpath
 
-%cmake -DQTONLY=ON                                 \
-       -DCMAKE_INSTALL_PREFIX=%{_prefix}           \
-       -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt4 .
+%build
 
+%cmake -DQTONLY=ON                                  \
+       -DWITH_DESIGNER_PLUGIN=ON                    \
+       -DCMAKE_SKIP_RPATH=TRUE                      \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix}            \
+       -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt4 . \
+       -DICON_INSTALL_DIR=%{_datadir}/icons
 
 %{__make} %{?_smp_mflags} VERBOSE=1
 
@@ -90,10 +93,16 @@
 %doc docs CODING
 %{_includedir}/%{name}
 %{_libdir}/libmarblewidget.so
+%{_qt4_prefix}/qt4/plugins/designer/libMarbleNavigatorPlugin.so
+%{_qt4_prefix}/qt4/plugins/designer/libMarbleWidgetPlugin.so
 
 
 
 %changelog
+* Mon Feb 04 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0.5.1-1
+- new upstream release
+- %%{name}-0.5-multilibs.patch : avoids hardcoded libdir
+
 * Mon Aug 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0.4.0.3-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/marble/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Aug 2007 13:36:21 -0000	1.5
+++ sources	4 Feb 2008 18:26:29 -0000	1.6
@@ -1 +1 @@
-143b9d7053f7c9c85a4111b7a7428706  marble-0.4-3.tar.bz2
+f0fc5438cc2f702e8c103f42b6e49363  marble-0.5.1.tar.bz2


