rpms/skychart/EL-6 skychart-3.0.1.6-desktop.patch, NONE, 1.1 skychart-3.0.1.6-strip.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 skychart.spec, 1.17, 1.18 sources, 1.3, 1.4 skychart-3.0.1.6-units.patch, 1.1, NONE skychart-3.0.1.6-wl.patch, 1.1, NONE

Sat Jul 24 18:30:51 UTC 2010

Author: lkundrak

Update of /cvs/pkgs/rpms/skychart/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7223/EL-6

Modified Files:
	.cvsignore import.log skychart.spec sources 
Added Files:
	skychart-3.0.1.6-desktop.patch skychart-3.0.1.6-strip.patch 
Removed Files:
	skychart-3.0.1.6-units.patch skychart-3.0.1.6-wl.patch 
Log Message:
Pull from devel


skychart-3.0.1.6-desktop.patch:
 skychart.desktop |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE skychart-3.0.1.6-desktop.patch ---
>From 3e60f9a650995bb464194a900e0a074e6d718dae Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat, 24 Jul 2010 12:25:37 -0400
Subject: [PATCH] Fix desktop entry

---
 .../Linux/share/applications/skychart.desktop      |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system_integration/Linux/share/applications/skychart.desktop b/system_integration/Linux/share/applications/skychart.desktop
index 9091f9d..b225266 100644
--- a/system_integration/Linux/share/applications/skychart.desktop
+++ b/system_integration/Linux/share/applications/skychart.desktop
@@ -2,10 +2,10 @@
 Version=1.0
 Encoding=UTF-8
 Name=Skychart
-Comment=Skychart / Cartes du Ciel
+Comment=Planetarium software for the advanced amateur astronomer
 Exec=skychart
-Icon=../pixmaps/skychart.xpm
+Icon=skychart
 Terminal=false
 Type=Application
-Categories=Education;Science;Astronomy
-GenericName[fr_CH]=
+Categories=Education;Science;Astronomy;
+GenericName=SkyChart
-- 
1.6.5.2


skychart-3.0.1.6-strip.patch:
 install.sh |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

--- NEW FILE skychart-3.0.1.6-strip.patch ---
>From 0273c3c873840514b09fb0a945305ca7a19d7026 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Sat, 24 Jul 2010 13:10:44 -0400
Subject: [PATCH] Do not strip binaries upon install

---
 install.sh |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index fcc8db1..0eeb429 100755
--- a/install.sh
+++ b/install.sh
@@ -17,12 +17,12 @@ install -m 755 -d $destdir/share/doc
 install -m 755 -d $destdir/share/doc/skychart
 install -m 755 -d $destdir/share/pixmaps
 
-install -v -m 755 -s skychart/cdc  $destdir/bin/skychart
-install -v -m 755 -s skychart/cdcicon  $destdir/bin/cdcicon
-install -v -m 755 -s varobs/varobs  $destdir/bin/varobs
-install -v -m 755 -s varobs/varobs_lpv_bulletin  $destdir/bin/varobs_lpv_bulletin
-install -v -m 644 -s skychart/library/getdss/libgetdss.so  $destdir/lib/libgetdss.so
-install -v -m 644 -s skychart/library/plan404/libplan404.so  $destdir/lib/libplan404.so
+install -v -m 755 skychart/cdc  $destdir/bin/skychart
+install -v -m 755 skychart/cdcicon  $destdir/bin/cdcicon
+install -v -m 755 varobs/varobs  $destdir/bin/varobs
+install -v -m 755 varobs/varobs_lpv_bulletin  $destdir/bin/varobs_lpv_bulletin
+install -v -m 644 skychart/library/getdss/libgetdss.so  $destdir/lib/libgetdss.so
+install -v -m 644 skychart/library/plan404/libplan404.so  $destdir/lib/libplan404.so
 install -v -m 644 system_integration/Linux/share/applications/skychart.desktop $destdir/share/applications/skychart.desktop
 install -v -m 644 system_integration/Linux/share/doc/skychart/changelog $destdir/share/doc/skychart/changelog
 install -v -m 644 system_integration/Linux/share/doc/skychart/copyright $destdir/share/doc/skychart/copyright
-- 
1.6.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Apr 2009 19:33:04 -0000	1.3
+++ .cvsignore	24 Jul 2010 18:30:50 -0000	1.4
@@ -1 +1 @@
-skychart-3.0.1.6.tar.lzma
+skychart-3.0.1.6.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	6 Nov 2008 01:12:27 -0000	1.1
+++ import.log	24 Jul 2010 18:30:51 -0000	1.2
@@ -1 +1,2 @@
 skychart-3_0_1_5-1_20081026svn_el5:HEAD:skychart-3.0.1.5-1.20081026svn.el5.src.rpm:1225937345
+skychart-3_0_1_6-3_20100724svn_el6:EL-6:skychart-3.0.1.6-3.20100724svn.el6.src.rpm:1279996194


Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/EL-6/skychart.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- skychart.spec	27 Jul 2009 04:25:28 -0000	1.17
+++ skychart.spec	24 Jul 2010 18:30:51 -0000	1.18
@@ -1,18 +1,18 @@
 Name:           skychart
 Version:        3.0.1.6
-Release:        2.20090408svn%{?dist}
+Release:        3.20100724svn%{?dist}
 Summary:        Planetarium software for the advanced amateur astronomer
 
-# svn export -r1050 https://skychart.svn.sourceforge.net/svnroot/skychart/trunk@1050 skychart-3.0.1.5
-# tar czf skychart-3.0.1.5.tar.gz skychart-3.0.1.5
+# svn export -r1351 https://svn.origo.ethz.ch/skychart/trunk@1351 skychart-3.0.1.6
+# tar czf skychart-3.0.1.6.tar.gz skychart-3.0.1.6
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            https://sourceforge.net/projects/skychart/
-Source0:        %{name}-%{version}.tar.lzma
+Source0:        %{name}-%{version}.tar.gz
 Source1:        skychart.desktop
-Patch1:         skychart-3.0.1.6-wl.patch
-Patch2:         skychart-3.0.1.6-units.patch
+Patch1:         skychart-3.0.1.6-desktop.patch
+Patch2:         skychart-3.0.1.6-strip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
@@ -42,84 +42,41 @@ atlas more complete than a conventional 
 
 %prep
 %setup -q
-%{__unzip} -q tools/doc/wiki_doc.zip -d tools/doc
-
-%patch1 -p1 -b .wl
-%patch2 -p1 -b .units
-find . -type f -print0 |xargs -0 chmod 644
+%patch1 -p1 -b .desktop
+%patch2 -p1 -b .strip
+find skychart -type f -print0 |xargs -0 chmod 644
 
 
 %build
-lazbuild --widgetset=gtk2 --primary-config-path=$PWD/.lazarus skychart/component/cdccomponents.lpk
-lazbuild --widgetset=gtk2 --primary-config-path=$PWD/.lazarus skychart/cdc.lpi
+./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix}
 
-# TODO: more libraries. Only 404 seems essential though.
-make %{_smp_mflags} CFLAGS="%{optflags} -fPIC" -C skychart/library/plan404
+# We build these separately so that we can apply optflags
+make %{_smp_mflags} arch_flags="%{optflags}" -C skychart/library/getdss
+make %{_smp_mflags} arch_flags="%{optflags}" -C skychart/library/plan404
 
-# Create the Icon Theme Specification compilant icon file
-convert skychart/bitmaps/mainicon/mainicon.ico skychart.png
+make # not concurrency-safe
 
 # Fix exotic EOL encodings
 dos2unix -qk tools/doc/html_doc/en/feature_class_fichiers/common.css
 dos2unix -qk tools/doc/html_doc/en/feature_class_fichiers/custom.css
-dos2unix -qk tools/doc/releasenotes_ru.txt
-dos2unix -qk tools/doc/releasenotes_ua.txt
-
-# A couple of files in Ukrainian documentation have their names and
-# links incorrectly escaped, which makes those not UTF-8 compilant as
-# well as links broken
-charset_fix () { sed -r '
-        # Special characters in file names are
-        # prefixed by %% vs. %%25 in HTML
-        s/\xd1%%(25)?81/с/g
-        s/\xd1%%(25)?82/т/g
-        s/\xd1%%(25)?8[fF]/я/g
-'; }
-
-for ORIGNAME in $(find tools/doc/wiki_doc/uk -name '*.html')
-do
-        NEWNAME=$(echo $ORIGNAME |charset_fix)
-        charset_fix <$ORIGNAME >$ORIGNAME.utf8
-        touch -r $ORIGNAME $ORIGNAME.utf8
-        rm -f $ORIGNAME
-        mv $ORIGNAME.utf8 $NEWNAME
-done
+dos2unix -qk tools/doc/releasenotes*.txt
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Directory structure
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -d $RPM_BUILD_ROOT%{_datadir}/applications
-install -d $RPM_BUILD_ROOT%{_datadir}/skychart
-
-# Binary
-install -pm 0755 skychart/units/skychart \
-        $RPM_BUILD_ROOT%{_bindir}
-
-# Libraries
-install -pm 0755 skychart/library/plan404/libplan404.so \
-        $RPM_BUILD_ROOT%{_libdir}
+make install install_data PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
-# Icon
-install -pm 0644 skychart.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+# Fix multilib path
+[ %{_lib} = lib ] || mv $RPM_BUILD_ROOT%{_prefix}/{lib,%{_lib}}
 
-# Menu entry
-desktop-file-install --vendor=fedora %{SOURCE1} \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications
+# Fix debuginfo
+chmod +x $RPM_BUILD_ROOT%{_libdir}/*
 
-# Data (Yes, tools/install_data.sh exists, but is outdated)
-(
-        cd tools
-        find data/{common_names,earthmap,horizon,language,planet,sample,Themes} -type f
-        find data/constellation -maxdepth 1 -type f
-        find data/eclipses -type f -name '*.png' -o -name '*.txt'
-        find cat -type f -not -regex '.*/src.*' -not -name '*.prj'
-        find doc -type f -not -name '*.zip'
-) |xargs tar cf - -C tools |tar xf - -C $RPM_BUILD_ROOT%{_datadir}/skychart
+# Menu entry
+desktop-file-install --vendor=fedora \
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        $RPM_BUILD_ROOT%{_datadir}/applications/skychart.desktop
 
 
 %clean
@@ -136,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/skychart/data
 %{_datadir}/skychart/cat
 %doc %{_datadir}/skychart/doc
+%exclude %{_datadir}/doc/skychart
 %doc skychart/gpl.txt
 
 
@@ -146,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 24 2010 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.6-3.20100724svn
+- Update to a later snapshot
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1.6-2.20090408svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Apr 2009 19:33:04 -0000	1.3
+++ sources	24 Jul 2010 18:30:51 -0000	1.4
@@ -1 +1 @@
-7021c215cfa6b61ab909ef2e6266abc7  skychart-3.0.1.6.tar.lzma
+bf5740ab05196d74a85ecab8247d84d8  skychart-3.0.1.6.tar.gz


--- skychart-3.0.1.6-units.patch DELETED ---


--- skychart-3.0.1.6-wl.patch DELETED ---

