rpms/marble/devel .cvsignore, 1.3, 1.4 marble-0.4-multilibs.patch, 1.1, 1.2 marble.spec, 1.4, 1.5 sources, 1.3, 1.4

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/marble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17437/devel

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/marble/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 15:20:03 -0000	1.3
+++ .cvsignore	26 Aug 2007 22:56:41 -0000	1.4
@@ -1 +1 @@
-marble-0.4-1.tar.bz2
+marble-0.4-2.tar.bz2

marble-0.4-multilibs.patch:

Index: marble-0.4-multilibs.patch
===================================================================
RCS file: /cvs/extras/rpms/marble/devel/marble-0.4-multilibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- marble-0.4-multilibs.patch	21 Aug 2007 15:20:03 -0000	1.1
+++ marble-0.4-multilibs.patch	26 Aug 2007 22:56:41 -0000	1.2
@@ -1,11 +1,13 @@
 --- src/lib/CMakeLists.txt	2007-08-19 18:33:36.000000000 +0200
-+++ CMakeLists.txt1	2007-08-21 13:37:22.000000000 +0200
-@@ -202,8 +202,6 @@
++++ CMakeLists.txt1	2007-08-21 21:05:01.000000000 +0200
+@@ -202,9 +202,7 @@
  
    else(APPLE AND QTONLY)
      if(QTONLY)
 -      install(TARGETS marblewidget DESTINATION lib)
 -    else(QTONLY)
-       install(TARGETS marblewidget DESTINATION ${LIB_INSTALL_DIR})
+-      install(TARGETS marblewidget DESTINATION ${LIB_INSTALL_DIR})
++      install(TARGETS marblewidget DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
      endif(QTONLY)
    endif(APPLE AND QTONLY)
+ endif(WIN32 AND QTONLY)


Index: marble.spec
===================================================================
RCS file: /cvs/extras/rpms/marble/devel/marble.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- marble.spec	21 Aug 2007 15:20:03 -0000	1.4
+++ marble.spec	26 Aug 2007 22:56:41 -0000	1.5
@@ -1,8 +1,8 @@
 Name:           marble
 
 #codename: Sladibadfast
-# upstream version: 0.4-1, but advised me to use:
-Version:        0.4.0.1
+# upstream version: 0.4-2, but advised me to use:
+Version:        0.4.0.2
 Release:        1%{?dist}
 Summary:        A KDE Desktop Globe
 
@@ -11,7 +11,7 @@
 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}-0.4-2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel cmake desktop-file-utils gpsd-devel
@@ -38,7 +38,7 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p0 -b .
+#%patch0 -p0 -b .
 
 %build
 
@@ -61,10 +61,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,8 +84,8 @@
 %{_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,-)
@@ -100,6 +96,9 @@
 
 
 %changelog
+* 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/extras/rpms/marble/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 15:20:03 -0000	1.3
+++ sources	26 Aug 2007 22:56:41 -0000	1.4
@@ -1 +1 @@
-36cfa5627817fbe1a636b0f4d8a6ed3f  marble-0.4-1.tar.bz2
+5f0cc385d591bd617f140d5ee9132900  marble-0.4-2.tar.bz2