rpms/merkaartor/F-9 merkaartor.desktop, NONE, 1.1 merkaartor.spec, NONE, 1.1 merkaartor.xpm, NONE, 1.1 sources, 1.1, 1.2

Mon Sep 8 19:48:44 UTC 2008

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12805

Modified Files:
	sources 
Added Files:
	merkaartor.desktop merkaartor.spec merkaartor.xpm 
Log Message:
Add F-9 version now that qt 4.4 is available for F9

--- NEW FILE merkaartor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Merkaartor
GenericName=OpenStreetMap Editor
Comment=Open .gpx files
Exec=merkaartor
Icon=merkaartor
Terminal=false
Type=Application
Categories=Graphics;



--- NEW FILE merkaartor.spec ---
Name:           merkaartor
Version:        0.11
Release:        1%{?dist}
Summary:        QT-Based OpenStreetMap editor

Group:          Applications/Productivity
License:        GPLv2
URL:            http://www.irule.be/bvh/c++/merkaartor/ 
Source0:        http://www.irule.be/pipe/Merkaartor-0.11.tar.bz2
Source1:        %{name}.desktop
Source2:        %{name}.xpm
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt4-devel >= 4.4
BuildRequires:  desktop-file-utils

%description
Merkaartor is a small editor for OpenStreetMap available under the
GNU General Public License and developed  using the Qt toolkit.

It has some unique features like anti-aliased displaying,
transparent display of map features like roads and curved roads.

%prep
%setup -q -n %{name}
sed -i 's/CONFIG += debug/CONFIG += release/' Merkaartor.pro
chmod 644 LICENSE
find -name "*.[ch]" -exec %{__chmod} -x '{}' \;   
find -name "*.cpp" -exec %{__chmod} -x '{}' \; 

%build
lrelease-qt4 Merkaartor.pro
qmake-qt4 Merkaartor.pro PREFIX=%{_prefix} NODEBUG=1 NOWEBKIT=1
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=${RPM_BUILD_ROOT} install
install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
desktop-file-install --vendor="fedora" \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/merkaartor/translations/%{name}_*.qm
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.xpm
%doc AUTHORS CHANGELOG HACKING LICENSE



%changelog
* Wed Aug 06 2008 Sven Lankes <sven at lank.es> - 0.11-1
- final 0.11 release 
- Updated versioning scheme - 0.x 

* Mon Jul 28 2008 slankes <sven at lank.es> - 0.0.11-0.1.rc1
- update to release candidate

* Thu Jul 24 2008 slankes <sven at lank.es> - 0.0.10-7
- fix executable source-files

* Wed Jun 25 2008 slankes <sven at lank.es> - 0.0.10-6
- remove superfluous make install from specfile
- tune requires/buildrequires

* Sat Jun 14 2008 slankes <sven at lank.es> - 0.0.10-5
- Remove unneeded buildrequires
- SPEC-Cleanup

* Sun May 18 2008 slankes <sven at lank.es> - 0.0.10-4
- Build in release mode instead of debug. This (among other things) makes merkaartor honour the rpm optflags) 

* Thu May  8 2008 slankes <sven at lank.es> - 0.0.10-3
- Preserve timestamps 

* Sun May  4 2008 slankes <sven at lank.es> - 0.0.10-2
- First package version



--- NEW FILE merkaartor.xpm ---
/* XPM */
static char * Merkaartor_xpm[] = {
"24 24 482 2",
"  	c #AC9744",
". 	c #877119",
"+ 	c #756110",
"@ 	c #735F11",
"# 	c #64530F",
"$ 	c #8B751F",
"% 	c #5F4F0E",
"& 	c #332A09",
"* 	c #141002",
"= 	c #151100",
"- 	c #342A02",
"; 	c #70622A",
"> 	c #74662F",
", 	c #574C20",
"' 	c #524513",
") 	c #524616",
"! 	c #54491E",
"~ 	c #685A1F",
"{ 	c #7E6A1E",
"] 	c #695918",
"^ 	c #756420",
"/ 	c #796515",
"( 	c #7B6616",
"_ 	c #A59556",
": 	c #7E6E2F",
"< 	c #705C0B",
"[ 	c #7C660D",
"} 	c #665309",
"| 	c #594703",
"1 	c #241D00",
"2 	c #171200",
"3 	c #181300",
"4 	c #2F2707",
"5 	c #4B3E0C",
"6 	c #92813D",
"7 	c #C3B26B",
"8 	c #A89856",
"9 	c #968649",
"0 	c #7F7037",
"a 	c #382D00",
"b 	c #120F00",
"c 	c #0D0A00",
"d 	c #261E00",
"e 	c #3D3100",
"f 	c #473902",
"g 	c #7D670D",
"h 	c #715C06",
"i 	c #776C3F",
"j 	c #7C6D30",
"k 	c #705D10",
"l 	c #6C590F",
"m 	c #453701",
"n 	c #0E0B00",
"o 	c #251E01",
"p 	c #705F1F",
"q 	c #C1AE67",
"r 	c #BBA85B",
"s 	c #AC9641",
"t 	c #BEAB61",
"u 	c #C6B571",
"v 	c #483B08",
"w 	c #BBA85D",
"x 	c #7F6F32",
"y 	c #433600",
"z 	c #2D2400",
"A 	c #0F0C00",
"B 	c #1D1800",
"C 	c #493C08",
"D 	c #423501",
"E 	c #6B5603",
"F 	c #8C7B36",
"G 	c #7E6D2A",
"H 	c #4D3E02",
"I 	c #473903",
"J 	c #231C00",
"K 	c #110D00",
"L 	c #4D3F05",
"M 	c #9A8531",
"N 	c #C1AF66",
"O 	c #BDAB61",
"P 	c #A69240",
"Q 	c #9C8B49",
"R 	c #A39354",
"S 	c #897B42",
"T 	c #94833E",
"U 	c #93823D",
"V 	c #8B7D45",
"W 	c #514412",
"X 	c #786725",
"Y 	c #5B4D16",
"Z 	c #100C00",
"` 	c #110E00",
" .	c #4E3F05",
"..	c #5B4902",
"+.	c #7F6F2E",
"@.	c #847332",
"#.	c #3A2F01",
"$.	c #221B00",
"%.	c #120E00",
"&.	c #1C1600",
"*.	c #2F2600",
"=.	c #2E2500",
"-.	c #2E2501",
";.	c #2C2300",
">.	c #352B00",
",.	c #1F1800",
"'.	c #211A00",
").	c #292100",
"!.	c #1E1800",
"~.	c #211B04",
"{.	c #181301",
"].	c #1E1803",
"^.	c #141000",
"/.	c #322A0A",
"(.	c #604F09",
"_.	c #927E30",
":.	c #978335",
"<.	c #554504",
"[.	c #0C0900",
"}.	c #171300",
"|.	c #392E02",
"1.	c #312701",
"2.	c #1A1501",
"3.	c #61531B",
"4.	c #AD9A51",
"5.	c #AF9A49",
"6.	c #816B13",
"7.	c #5B4900",
"8.	c #413400",
"9.	c #282000",
"0.	c #735F0E",
"a.	c #3D3105",
"b.	c #2A2100",
"c.	c #978330",
"d.	c #9B8634",
"e.	c #2F2601",
"f.	c #0A0800",
"g.	c #191400",
"h.	c #161200",
"i.	c #4F4108",
"j.	c #9F8933",
"k.	c #BFAD63",
"l.	c #BBA960",
"m.	c #AB9748",
"n.	c #5E4E0B",
"o.	c #1D1700",
"p.	c #100D00",
"q.	c #56460A",
"r.	c #7C660C",
"s.	c #504104",
"t.	c #110D01",
"u.	c #98853C",
"v.	c #201900",
"w.	c #312802",
"x.	c #403407",
"y.	c #B4A04F",
"z.	c #C3B169",
"A.	c #C5B46E",
"B.	c #C9B977",
"C.	c #7D6918",
"D.	c #292000",
"E.	c #493C09",
"F.	c #312700",
"G.	c #130F00",
"H.	c #54460C",
"I.	c #765F08",
"J.	c #6B5602",
"K.	c #140F00",
"L.	c #5C522A",
"M.	c #91803C",
"N.	c #302602",
"O.	c #887113",
"P.	c #403509",
"Q.	c #3D3102",
"R.	c #807238",
"S.	c #B2A260",
"T.	c #908042",
"U.	c #594E27",
"V.	c #604F08",
"W.	c #473900",
"X.	c #1A1400",
"Y.	c #423503",
"Z.	c #735E09",
"`.	c #745F08",
" +	c #4E3E01",
".+	c #1A1500",
"++	c #49411F",
"@+	c #86783F",
"#+	c #2E2400",
"$+	c #635109",
"%+	c #8C761C",
"&+	c #937D27",
"*+	c #5F4F10",
"=+	c #302703",
"-+	c #857844",
";+	c #52471A",
">+	c #2C2509",
",+	c #3C3000",
"'+	c #382C00",
")+	c #2A2101",
"!+	c #241C00",
"~+	c #211A01",
"{+	c #4B3C01",
"]+	c #7E670B",
"^+	c #745E06",
"/+	c #584702",
"(+	c #514823",
"_+	c #7A6B32",
":+	c #322800",
"<+	c #6A5608",
"[+	c #988125",
"}+	c #947C1C",
"|+	c #A18A2F",
"1+	c #AD994B",
"2+	c #B19F59",
"3+	c #7E6A1B",
"4+	c #B9A657",
"5+	c #AB9950",
"6+	c #7C6A23",
"7+	c #4B3C00",
"8+	c #796823",
"9+	c #403404",
"0+	c #887424",
"a+	c #8B730F",
"b+	c #886F0F",
"c+	c #7A6308",
"d+	c #735D05",
"e+	c #423500",
"f+	c #463C12",
"g+	c #917E32",
"h+	c #483A01",
"i+	c #877012",
"j+	c #8B7419",
"k+	c #9E862A",
"l+	c #A48D32",
"m+	c #BEAC61",
"n+	c #AF9B4E",
"o+	c #C7B673",
"p+	c #BBAA65",
"q+	c #6C5A13",
"r+	c #614E02",
"s+	c #7B6C30",
"t+	c #8F7A23",
"u+	c #927917",
"v+	c #876E0B",
"w+	c #856D10",
"x+	c #745E05",
"y+	c #3F350C",
"z+	c #887735",
"A+	c #251E00",
"B+	c #594805",
"C+	c #8F7717",
"D+	c #9E8629",
"E+	c #A18A2E",
"F+	c #9C852C",
"G+	c #8D7B34",
"H+	c #504416",
"I+	c #766628",
"J+	c #AC9A51",
"K+	c #5A4A0A",
"L+	c #624F04",
"M+	c #584703",
"N+	c #5D4C08",
"O+	c #957E22",
"P+	c #8D7411",
"Q+	c #846B0A",
"R+	c #7D6609",
"S+	c #574603",
"T+	c #4F4316",
"U+	c #766831",
"V+	c #584805",
"W+	c #897113",
"X+	c #927A1B",
"Y+	c #977F1F",
"Z+	c #675613",
"`+	c #4A3C05",
" @	c #4F4210",
".@	c #534719",
"+@	c #544407",
"@@	c #5C4A04",
"#@	c #483A00",
"$@	c #40350B",
"%@	c #968026",
"&@	c #887010",
"*@	c #9A8223",
"=@	c #947C1A",
"-@	c #886F0C",
";@	c #856D0C",
">@	c #5D4B03",
",@	c #594C1C",
"'@	c #8C7E46",
")@	c #1B1600",
"!@	c #5C4B0A",
"~@	c #967E1E",
"{@	c #322907",
"]@	c #665924",
"^@	c #695B22",
"/@	c #372E0B",
"(@	c #403300",
"_@	c #231D04",
":@	c #AB9952",
"<@	c #9B852D",
"[@	c #866E12",
"}@	c #998020",
"|@	c #8C7411",
"1@	c #8C7310",
"2@	c #80690D",
"3@	c #41360C",
"4@	c #80733E",
"5@	c #342A00",
"6@	c #7F6912",
"7@	c #9B8326",
"8@	c #998124",
"9@	c #8F7718",
"0@	c #5D4B05",
"a@	c #A6944C",
"b@	c #6E6026",
"c@	c #302600",
"d@	c #5C5021",
"e@	c #9D893B",
"f@	c #6D590D",
"g@	c #282104",
"h@	c #796410",
"i@	c #937A1A",
"j@	c #7D6504",
"k@	c #5A4903",
"l@	c #53481A",
"m@	c #867942",
"n@	c #2D2608",
"o@	c #816C16",
"p@	c #9E8628",
"q@	c #91791A",
"r@	c #A18B36",
"s@	c #776006",
"t@	c #90791E",
"u@	c #443702",
"v@	c #7E6B20",
"w@	c #A29150",
"x@	c #BAA75B",
"y@	c #A48F3D",
"z@	c #362B00",
"A@	c #0C0A00",
"B@	c #483A02",
"C@	c #927A1A",
"D@	c #564503",
"E@	c #524615",
"F@	c #887D50",
"G@	c #473E1A",
"H@	c #B19E55",
"I@	c #B7A354",
"J@	c #806F28",
"K@	c #382E03",
"L@	c #7F6E2E",
"M@	c #836C0F",
"N@	c #806A10",
"O@	c #75600D",
"P@	c #937D26",
"Q@	c #6D5807",
"R@	c #1C1703",
"S@	c #C3B26C",
"T@	c #B8A558",
"U@	c #A38D37",
"V@	c #2C2403",
"W@	c #4C3E02",
"X@	c #66571B",
"Y@	c #A9995A",
"Z@	c #BBA85E",
"`@	c #BAA658",
" #	c #BEAB60",
".#	c #635315",
"+#	c #695818",
"@#	c #715D0F",
"##	c #8A7212",
"$#	c #715D0C",
"%#	c #6B580D",
"&#	c #7C660E",
"*#	c #41391A",
"=#	c #C3B16B",
"-#	c #856F19",
";#	c #0B0900",
">#	c #0F0B00",
",#	c #453B15",
"'#	c #BFAD65",
")#	c #BBA85A",
"!#	c #BDAA5D",
"~#	c #B5A153",
"{#	c #5F5117",
"]#	c #B9A556",
"^#	c #806C1B",
"/#	c #8B782D",
"(#	c #87721E",
"_#	c #4D3E05",
":#	c #221D0B",
"<#	c #6C5F29",
"[#	c #B9A75E",
"}#	c #604F0D",
"|#	c #433707",
"1#	c #272002",
"2#	c #292102",
"3#	c #54491D",
"4#	c #261F06",
"5#	c #3D3411",
"6#	c #BFAC64",
"7#	c #B9A555",
"8#	c #BDAA5E",
"9#	c #917F35",
"0#	c #76682C",
"a#	c #BFAC61",
"b#	c #857226",
"c#	c #846D15",
"d#	c #433705",
"e#	c #705B06",
"f#	c #4D4213",
"g#	c #7F7034",
"h#	c #685818",
"i#	c #A59141",
"j#	c #B8A559",
"k#	c #635418",
"l#	c #94864C",
"m#	c #C6B570",
"n#	c #AA9645",
"o#	c #453B16",
"p#	c #B0A061",
"q#	c #B6A250",
"r#	c #766729",
"s#	c #1D1703",
"t#	c #BFAD64",
"u#	c #BFAD62",
"v#	c #C0AD63",
"w#	c #7E6B1D",
"x#	c #7B650E",
"y#	c #6D5F28",
"z#	c #8C7B39",
"A#	c #C1B06C",
"B#	c #C8B774",
"C#	c #CABA79",
"D#	c #AF9B4D",
"E#	c #C0AE68",
"F#	c #CAB978",
"G#	c #C0AE67",
"H#	c #5B4C0F",
"I#	c #4B4220",
"J#	c #A19257",
"K#	c #AB9641",
"L#	c #38300D",
"M#	c #221C04",
"N#	c #BFAD66",
"O#	c #C2AF66",
"P#	c #C3B168",
"Q#	c #A7954E",
"R#	c #908040",
"S#	c #C7B571",
"T#	c #CEBE80",
"U#	c #CDBD7F",
"V#	c #CEBF82",
"W#	c #CBBC7C",
"X#	c #C7B672",
"Y#	c #C9B877",
"Z#	c #B19D4D",
"`#	c #6D5A0D",
" $	c #403819",
".$	c #9E8E50",
"+$	c #8E7A2E",
"@$	c #AD9844",
"#$	c #302702",
"$$	c #3A310D",
"%$	c #C3B16A",
"&$	c #C4B26B",
"*$	c #C5B36D",
"=$	c #BBA75B",
"-$	c #3A2F02",
";$	c #6F612A",
">$	c #CEBF81",
",$	c #CDBD7E",
"'$	c #C9B978",
")$	c #695C2B",
"!$	c #816F29",
"~$	c #CAB977",
"{$	c #C6B572",
"]$	c #937F2F",
"^$	c #5C4B06",
"/$	c #6F6230",
"  . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ ",
": < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i ",
"j k l m 3 n o p q r s t u v w x y z A B C D E F ",
"G H I J K L M N O P Q R S T U V W X Y Z `  ...+.",
"@.#.$.%.2 &.*.=.-.=.;.z >.,.'.).!.~.{.].^./.(._.",
":.<.[.}.,.|.1.2.3.4.5.6.7.8.9.3 ` c #.0.a.A b.c.",
"d.e.f.c 3 g.h.i.j.k.l.m.n.).o.2 p.%.q.r.s.'.t.+.",
"u.v.n A w.x.K - y.z.A.B.C.=.D.E.F.G.H.I.J.=.K.L.",
"M.1 ^.=.N.O.P.Q.R.S.T.U.V.W.x.b.X.n Y.Z.`. +.+++",
"@+1 K #+$+%+&+*+=+-+;+>+,+'+)+!+~+K {+]+^+/+J (+",
"_+:+&.*.<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+",
"g+y o.h+i+j+k+l+m+n+k.o+p+q+r+s+W.t+u+v+w+x+7+y+",
"z+A+2 B+C+D+E+F+G+H+I+J+K+L+M+&.N+O+u+P+Q+R+S+T+",
"U+2 '.V+W+X+Y+Z+`+ @. at +@@@#@;.$@%@&@*@=@-@;@>@,@",
"'@A+)@!@~@k+Y+w.{@]@^@/@b.(@_@:@<@[@}@|@1 at 2@S+3@",
"4 at 1 5 at 6@7 at 8@9 at r+0@a at b@c at 5@g.d at w e at f@g at h@i at j@k at l@",
"m at g.n@o at p@q at r@s at t@{+u at v@3 K w at x@y at z@A at p.B@C at D@E@",
"F at G@H at I@J at K@L at M@N at O@P at Q@!.R at S@T at U@^.c [.A at V@W at X@",
"Y at Z@`@ #.#[ +#@###$#%#&#).*#=#p+-#%.%.K ;#>#g.,#",
"'#)#!#~#{#]#^#B@/#(#_#B@!.:#<#[#}#|#1#2#3#4#d 5#",
"6#7#8#9#0#N a#b#c#0+d#e#9.f#g#h#i#j#k#l#m#n#1.o#",
"p#q#8#r#s#t#u#v#w#x#9.e.y#z#A#B#C#D#E#F#G#=#H#I#",
"J#K#N L#M#N#O#P#Q#e.2#R#S#T#U#V#W#U+X#C#Y#Z#`# $",
".$+$@$#$$$%$&$*$=$-$;$u X#>$,$'$)$!$~$U#{$]$^$/$"};


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jul 2008 16:54:37 -0000	1.1
+++ sources	8 Sep 2008 19:48:14 -0000	1.2
@@ -0,0 +1 @@
+338b9c5563199be3b2282bdf550ae407  Merkaartor-0.11.tar.bz2


