Attachment 3191 Details for Bug 7932 – little modifications to the previous spec file

[patch] little modifications to the previous spec file

opencpn-spec.diff (text/plain), 1.56 KB, created by Philippe Didier on 2012-12-04 02:36:00 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2012-12-04 02:36:00 CET

Size: 1.56 KB

patch

obsolete

>--- opencpn.specorig	2012-12-04 02:25:31.006708219 +0100
>+++ opencpn.spec	2012-12-04 02:05:24.062574432 +0100
>@@ -1,25 +1,27 @@
>+%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
>+Source0:	http://opencpn.org/ocpn/downloads/beta/%{tarname}-%{version}-Source.tar.gz
>+Patch0:		opencpn-desktop.patch	
> 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 +36,8 @@
> 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
>+%patch0 -p1
> 
> %build
> cmake	. \

--- opencpn.specorig	2012-12-04 02:25:31.006708219 +0100
+++ opencpn.spec	2012-12-04 02:05:24.062574432 +0100
@@ -1,25 +1,27 @@
+%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
+Source0:	http://opencpn.org/ocpn/downloads/beta/%{tarname}-%{version}-Source.tar.gz
+Patch0:		opencpn-desktop.patch	
 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 +36,8 @@
 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
+%patch0 -p1
 
 %build
 cmake	. \

Actions: View | Diff

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