rpms/marble/F-7 marble-0.5-multilibs.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 marble.spec, 1.4, 1.5 sources, 1.3, 1.4 marble-0.4-multilibs.patch, 1.1, NONE

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	.cvsignore marble.spec sources 
Added Files:
	marble-0.5-multilibs.patch 
Removed Files:
	marble-0.4-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-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 15:18:01 -0000	1.3
+++ .cvsignore	4 Feb 2008 19:24:04 -0000	1.4
@@ -1 +1 @@
-marble-0.4-1.tar.bz2
+marble-0.5.1.tar.bz2


Index: marble.spec
===================================================================
RCS file: /cvs/pkgs/rpms/marble/F-7/marble.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- marble.spec	21 Aug 2007 15:18:01 -0000	1.4
+++ marble.spec	4 Feb 2008 19:24:04 -0000	1.5
@@ -1,19 +1,17 @@
 Name:           marble
 
-#codename: Sladibadfast
-# upstream version: 0.4-1, but advised me to use:
-Version:        0.4.0.1
+Version:        0.5.1
 Release:        1%{?dist}
-Summary:        A KDE Desktop Globe
+Summary:        A KDE4 Desktop Globe
 
 Group:          Applications/Engineering
 License:        LGPLv2
-Patch0:         %{name}-0.4-multilibs.patch
 
 URL:            http://edu.kde.org/marble/
-Source0:        http://developer.kde.org/~tackat/marble/%{name}-0.4-1.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,14 +36,17 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p0 -b .
 
-%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
 
@@ -61,10 +62,6 @@
   --delete-original                          \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -p -m 644 data/svg/%{name}-icon.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -88,18 +85,30 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}
 %{_libdir}/libmarblewidget.so.*
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-
+%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/marble.png
 
 %files devel
 %defattr(-,root,root,-)
 %doc docs CODING
 %{_includedir}/%{name}
 %{_libdir}/libmarblewidget.so
+%{_qt4_prefix}/plugins/designer/libMarbleNavigatorPlugin.so
+%{_qt4_prefix}/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
+
+* Sun Aug 26 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0.4.0.2-1
+- new upstream release
+
 * Sun Aug 19 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0.4.0.1-1
 - new upstream release and applied fix for multilibs
 - change license tag to LGPLv2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/marble/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 15:18:01 -0000	1.3
+++ sources	4 Feb 2008 19:24:04 -0000	1.4
@@ -1 +1 @@
-36cfa5627817fbe1a636b0f4d8a6ed3f  marble-0.4-1.tar.bz2
+f0fc5438cc2f702e8c103f42b6e49363  marble-0.5.1.tar.bz2


--- marble-0.4-multilibs.patch DELETED ---