packages: xrmap/xrmap.spec - updated some data sources, added new ones, - u...

[gotar]

Author: gotar                        Date: Fri Jun 26 12:26:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated some data sources, added new ones,
- updated BRs

---- Files affected:
packages/xrmap:
   xrmap.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/xrmap/xrmap.spec
diff -u packages/xrmap/xrmap.spec:1.7 packages/xrmap/xrmap.spec:1.8
--- packages/xrmap/xrmap.spec:1.7	Mon Feb 12 23:09:25 2007
+++ packages/xrmap/xrmap.spec	Fri Jun 26 14:26:06 2009
@@ -10,25 +10,45 @@
 Group:		X11/Applications/Science
 Source0:	http://frmas.free.fr/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	f3d37e38337aaae35c9ea7d3499002eb
-Source1:	http://frmas.free.fr/files/CIA_WDB2.jpd.gz
-# Source1-md5:	5a08415115ef4555aa6ba5e8a19791ec
-Source2:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/anthems-1.1.tar.bz2
-# Source2-md5:	4d63e6a61e9197f3c382e518de6503db
+Source1:	http://frmas.free.fr/files/CIA_WDB2.jpd.bz2
+# Source1-md5:	8b5255a685bbb5eef2f86df182731a32
+Source2:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/anthems-1.2.tar.bz2
+# Source2-md5:	7e8f454f7ad04776c6455b75225630bf
 Source3:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/flags-1.1.tar.bz2
 # Source3-md5:	e15fbfb1f1c8a313573ac499fb0ea090
-Source4:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/hymns-1.2.tar.bz2
-# Source4-md5:	b5c1c26e1d5c842c53c9a5460cb02864
+Source4:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/hymns-1.3.tar.bz2
+# Source4-md5:	682dfd893b2ed46c175e6c0a2374cbbe
 Source5:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/factbook_text_2002.tar.bz2
 # Source5-md5:	d28fc69a9fd48d9d39a1fda8099cfb1b
 Source6:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/factbook_html_2002.tar.bz2
 # Source6-md5:	7909b52825123c677369eb723e5b267f
-Source7:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/pdfmaps-1.1.tar.gz
-# Source7-md5:	9a40499034f7a98949ab690731eb6e70
+Source7:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/pdfmaps-1.3.tar.bz2
+# Source7-md5:	049df5f1c9d3f1fe105d214ce45ef687
 Source8:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/eawpats12.tar.bz2
 # Source8-md5:	7d1b390e976ca121a6713f779a7c2148
+# there are also {png,xpm}_{150,480} available
+Source9:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/flags-2.9-eps.tar.bz2
+# Source9-md5:	9df0819ef558796442cfc72784c9b92e
+Source10:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/flags-2.9-svg.tar.bz2
+# Source10-md5:	714f367a44ece703548b498406ad8936
+Source11:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/earthdata_med_res.tar.bz2
+# Source11-md5:	d1754a7bf81d97c3338da30db467598c
+Source12:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/etopo2.bz2
+# Source12-md5:	376e8990e775497a4c7a808d33cb840e
+Source13:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/etopo5.bz2
+# Source13-md5:	4d21bfee318688f44badccec54184362
+Source14:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/population.dat.bz2
+# Source14-md5:	0fa2a9b9805f55aa021456bccd4f5281
+# each coat of arms has its specific copyright
+#Source15:	ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/coat_of_arms-2.10.tar.bz2
 URL:		http://frmas.free.fr/li_1.htm
-BuildRequires:	XFree86-devel
-BuildRequires:	imake
+BuildRequires:	gpsd-devel
+BuildRequires:	xorg-cf-files
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-proto-xproto-devel
+BuildRequires:	xorg-util-imake
+BuildRequires:	zlib-devel
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,7 +93,7 @@
 	MANDIR=%{_mandir}/man1 \
 	SHAREDIR=%{_datadir}/rmap
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rmap
+bzip2 -dc %{SOURCE1} > $RPM_BUILD_ROOT%{_datadir}/rmap/CIA_WDB2.jpd
 tar jxf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/rmap
 tar jxf %{SOURCE3} -C $RPM_BUILD_ROOT%{_datadir}/rmap
 tar jxf %{SOURCE4} -C $RPM_BUILD_ROOT%{_datadir}/rmap
@@ -81,6 +101,12 @@
 tar jxf %{SOURCE6} -C $RPM_BUILD_ROOT%{_datadir}/rmap
 tar jxf %{SOURCE7} -C $RPM_BUILD_ROOT%{_datadir}/rmap
 tar jxf %{SOURCE8} -C $RPM_BUILD_ROOT%{_datadir}/rmap
+tar jxf %{SOURCE9} -C $RPM_BUILD_ROOT%{_datadir}/rmap
+tar jxf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/rmap
+tar jxf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/rmap
+bzip2 -dc %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/rmap/etopo2
+bzip2 -dc %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/rmap/etopo2
+bzip2 -dc %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/rmap/population.dat
 
 mv -f editkit/README{,-editkit}
 
@@ -100,6 +126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/06/26 12:26:06  gotar
+- updated some data sources, added new ones,
+- updated BRs
+
 Revision 1.7  2007/02/12 22:09:25  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xrmap/xrmap.spec?r1=1.7&r2=1.8&f=u