rpms/marble/F-7 marble-0.4-multilibs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 marble.spec, 1.3, 1.4 sources, 1.2, 1.3
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Tue Aug 21 15:18:34 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/marble/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31779/F-7
Modified Files:
.cvsignore marble.spec sources
Added Files:
marble-0.4-multilibs.patch
Log Message:
marble-0.4-multilibs.patch:
--- NEW FILE marble-0.4-multilibs.patch ---
--- 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 @@
else(APPLE AND QTONLY)
if(QTONLY)
- install(TARGETS marblewidget DESTINATION lib)
- else(QTONLY)
install(TARGETS marblewidget DESTINATION ${LIB_INSTALL_DIR})
endif(QTONLY)
endif(APPLE AND QTONLY)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/marble/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 Apr 2007 07:18:33 -0000 1.2
+++ .cvsignore 21 Aug 2007 15:18:01 -0000 1.3
@@ -1 +1 @@
-marble_0.3-1.tar.gz
+marble-0.4-1.tar.bz2
Index: marble.spec
===================================================================
RCS file: /cvs/extras/rpms/marble/F-7/marble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- marble.spec 21 Jun 2007 18:11:14 -0000 1.3
+++ marble.spec 21 Aug 2007 15:18:01 -0000 1.4
@@ -1,18 +1,20 @@
Name: marble
- #("Fjords")
-#upstream version : 0.3-1
-Version: 0.3.1
-Release: 4%{?dist}
+
+#codename: Sladibadfast
+# upstream version: 0.4-1, but advised me to use:
+Version: 0.4.0.1
+Release: 1%{?dist}
Summary: A KDE Desktop Globe
Group: Applications/Engineering
-License: LGPL
+License: LGPLv2
+Patch0: %{name}-0.4-multilibs.patch
URL: http://edu.kde.org/marble/
-Source0: http://developer.kde.org/~tackat/marble/kubuntu/marble_0.3-1.tar.gz
+Source0: http://developer.kde.org/~tackat/marble/%{name}-0.4-1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt4-devel cmake desktop-file-utils
+BuildRequires: qt4-devel cmake desktop-file-utils gpsd-devel
%description
@@ -23,24 +25,26 @@
applications like Google Earth or Nasa World Wind it's rather
meant to be a small light weight multi purpose widget.
+%package devel
+Summary: Development files for marble
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel
+
+
+%description devel
+Development files for marble
+
%prep
%setup -q -n %{name}
+%patch0 -p0 -b .
%build
-%ifarch ppc ppc64
-sed -i.flags -e 's|-msse||' src/CMakeLists.txt
-%endif
-
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-
-export CMAKE_CXX_FLAGS="$CXXFLAGS"
-
-cmake \
- -DQTONLY=ON \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt4 .
+%cmake -DQTONLY=ON \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt4 .
%{__make} %{?_smp_mflags} VERBOSE=1
@@ -57,20 +61,52 @@
--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}
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
%files
%defattr(-,root,root,-)
-%doc CREDITS LICENSE.txt marble-intro.pdf
+%doc CREDITS LICENSE.txt ChangeLog TODO MANIFESTO.txt USECASES
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/apps/%{name}
+%{_libdir}/libmarblewidget.so.*
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+
+
+%files devel
+%defattr(-,root,root,-)
+%doc docs CODING
+%{_includedir}/%{name}
+%{_libdir}/libmarblewidget.so
+
%changelog
+* 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
+- added devel package to create additional Qt-Designer-Plugin for developers
+- gpsd support
+- added missing icons
+
* Thu Jun 21 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 0.3.1-4
- fix for ppc64
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/marble/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Apr 2007 07:18:33 -0000 1.2
+++ sources 21 Aug 2007 15:18:01 -0000 1.3
@@ -1 +1 @@
-9d10af6c5f8b67503857426f84d8b358 marble_0.3-1.tar.gz
+36cfa5627817fbe1a636b0f4d8a6ed3f marble-0.4-1.tar.bz2
More information about the fedora-extras-commits
mailing list