Attachment 3194 Details for Bug 7932 – cumulated modifications to the initial spec file

[patch] cumulated modifications to the initial spec file

opencpn.diff (text/plain), 2.03 KB, created by Philippe Didier on 2012-12-04 22:00:51 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2012-12-04 22:00:51 CET

Size: 2.03 KB

patch

obsolete

>--- opencpn.specorig	2012-12-04 21:38:15.445891987 +0100
>+++ opencpn.spec	2012-12-04 21:36:13.016547026 +0100
>@@ -1,25 +1,30 @@
>+## NOTE Please read README_packaging.txt before updating this package.
>+
>+%define tarname	OpenCPN
>+
> Name:		opencpn
>-Summary:	OpenCPN: A concise ChartPlotter and Navigation software
>+Summary:	A concise Chartplotter and Navigation software
> Version:	3.0.2
> Release:	%mkrel 1
> License:	GPLv2+
> Group:		Geography
>-URL:		http://opencpn.org
>-Source0:	http://opencpn.org/ocpn/downloads/beta/OpenCPN-3.0.2-Source.tar.gz
>+URL:		http://%{name}.org
>+Source0:	http://%{name}.org/ocpn/downloads/beta/%{tarname}-%{version}-Source.tar.gz
>+# in spite of the directory name, IT IS NOT A BETA VERSION !!!
>+Source1:	Readme_packaging.txt
> BuildRequires:	cmake
> BuildRequires:	bzip2-devel
>-BuildRequires:	gpsd-devel
>-BuildRequires:	gtk+2-devel
>-BuildRequires:	mesagl-devel
>-BuildRequires:	mesaglu-devel
>+BuildRequires:	gettext
> BuildRequires:	wxgtku-devel
>-BuildRequires:	zlib-devel
>-BuildRequires:	libfreetype6-devel
>-# If Building with TinyXML from repositories causes segfault at start comment next line
>+BuildRequires:	pkgconfig(freetype2)
>+BuildRequires:	pkgconfig(gl)
>+BuildRequires:	pkgconfig(glu)
>+BuildRequires:	pkgconfig(gtk+-2.0)
>+BuildRequires:	pkgconfig(libgps)
>+BuildRequires:	pkgconfig(zlib)
> BuildRequires:	tinyxml-devel
>-# If Building with TinyXML from repositories causes segfault at start uncomment next line
>-# BuildConflicts:	tinyxml-devel
>-Requires:	gpsd-client
>+
>+Requires:	gpsd-clients
> 
> 
> %description
>@@ -34,7 +39,7 @@
> Pilot charts can be downloaded from http://opencpn.org/ocpn/downloadpilotcharts
> 
> %prep
>-%setup -q -n OpenCPN-3.0.2-Source
>+%setup -q -n %{tarname}-%{version}-Source
> 
> %build
> cmake	. \
>@@ -48,6 +53,13 @@
> 
> %find_lang %{name} --all-name
> 
>+ desktop-file-install  \
>+ --dir=%{buildroot}%{_datadir}/applications \
>+ --remove-category='Education' \
>+ --remove-category='Science' \
>+ --add-category='Education' \
>+  %{buildroot}%{_datadir}/applications/%{name}.desktop
>+ 
> %files -f %{name}.lang
> %doc README
> %{_bindir}/*

--- opencpn.specorig	2012-12-04 21:38:15.445891987 +0100
+++ opencpn.spec	2012-12-04 21:36:13.016547026 +0100
@@ -1,25 +1,30 @@
+## NOTE Please read README_packaging.txt before updating this package.
+
+%define tarname	OpenCPN
+
 Name:		opencpn
-Summary:	OpenCPN: A concise ChartPlotter and Navigation software
+Summary:	A concise Chartplotter and Navigation software
 Version:	3.0.2
 Release:	%mkrel 1
 License:	GPLv2+
 Group:		Geography
-URL:		http://opencpn.org
-Source0:	http://opencpn.org/ocpn/downloads/beta/OpenCPN-3.0.2-Source.tar.gz
+URL:		http://%{name}.org
+Source0:	http://%{name}.org/ocpn/downloads/beta/%{tarname}-%{version}-Source.tar.gz
+# in spite of the directory name, IT IS NOT A BETA VERSION !!!
+Source1:	Readme_packaging.txt
 BuildRequires:	cmake
 BuildRequires:	bzip2-devel
-BuildRequires:	gpsd-devel
-BuildRequires:	gtk+2-devel
-BuildRequires:	mesagl-devel
-BuildRequires:	mesaglu-devel
+BuildRequires:	gettext
 BuildRequires:	wxgtku-devel
-BuildRequires:	zlib-devel
-BuildRequires:	libfreetype6-devel
-# If Building with TinyXML from repositories causes segfault at start comment next line
+BuildRequires:	pkgconfig(freetype2)
+BuildRequires:	pkgconfig(gl)
+BuildRequires:	pkgconfig(glu)
+BuildRequires:	pkgconfig(gtk+-2.0)
+BuildRequires:	pkgconfig(libgps)
+BuildRequires:	pkgconfig(zlib)
 BuildRequires:	tinyxml-devel
-# If Building with TinyXML from repositories causes segfault at start uncomment next line
-# BuildConflicts:	tinyxml-devel
-Requires:	gpsd-client
+
+Requires:	gpsd-clients
 
 
 %description
@@ -34,7 +39,7 @@
 Pilot charts can be downloaded from http://opencpn.org/ocpn/downloadpilotcharts
 
 %prep
-%setup -q -n OpenCPN-3.0.2-Source
+%setup -q -n %{tarname}-%{version}-Source
 
 %build
 cmake	. \
@@ -48,6 +53,13 @@
 
 %find_lang %{name} --all-name
 
+ desktop-file-install  \
+ --dir=%{buildroot}%{_datadir}/applications \
+ --remove-category='Education' \
+ --remove-category='Science' \
+ --add-category='Education' \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
+ 
 %files -f %{name}.lang
 %doc README
 %{_bindir}/*

Actions: View | Diff

Attachments on bug 7932: 3013 | 3018 | 3189 | 3190 | 3191 | 3192 | 3193 | 3194 | 3195 | 3196 | 3200 | 3201 | 3202 | 3206 | 3210 | 3211