[skychart: 1/2] New upstream source New source with ephemeris

[Sergio Pascual]

commit 115af301760cff228ab661e9f0fb51927aa0e652
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jan 20 00:32:08 2012 +0100

    New upstream source
    New source with ephemeris

 .gitignore              |    1 +
 skychart-wgetdata.patch |   34 +++++++++++++++++++++++
 skychart.spec           |   69 +++++++++++++++++++++++++---------------------
 sources                 |    2 +-
 4 files changed, 73 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9faa936..8f5c510 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 skychart-3.0.1.6.tar.gz
 /skychart_3.2-source.tgz
+/data_jpleph.tgz
diff --git a/skychart-wgetdata.patch b/skychart-wgetdata.patch
new file mode 100644
index 0000000..4bb7202
--- /dev/null
+++ b/skychart-wgetdata.patch
@@ -0,0 +1,34 @@
+--- a/tools/install_data.sh	2010-12-28 22:37:10.000000000 +0100
++++ b/tools/install_data.sh	2011-12-20 20:47:00.195311126 +0100
+@@ -4,9 +4,9 @@
+   pkg=$1.tgz
+   ddir=$2
+   pkgz=../BaseData/$pkg
+-  if [ ! -e $pkgz ]; then
+-     wget http://download.origo.ethz.ch/skychart/2443/$pkg -O $pkgz
+-  fi
++#  if [ ! -e $pkgz ]; then
++#     wget http://download.origo.ethz.ch/skychart/2443/$pkg -O $pkgz
++#  fi
+   tar xvzf $pkgz -C $ddir
+ }
+ 
+@@ -42,12 +42,12 @@
+   install -v -m 644  $f $destdir/share/skychart/$f
+ done
+ 
+-if [ ! -d doc/wiki_doc ]; then
+-  cd wiki_doc
+-  ./getdoc.sh
+-  ./copydoc.sh
+-  cd ..
+-fi
++#if [ ! -d doc/wiki_doc ]; then
++#  cd wiki_doc
++#  ./getdoc.sh
++#  ./copydoc.sh
++#  cd ..
++#fi
+ 
+ for f in $(find doc/wiki_doc/|grep -v .svn)
+ do
diff --git a/skychart.spec b/skychart.spec
index 5a1d63d..6629d48 100644
--- a/skychart.spec
+++ b/skychart.spec
@@ -1,28 +1,26 @@
-Name:           skychart
-Version:        3.2
-Release:        5%{?dist}
-Summary:        Planetarium software for the advanced amateur astronomer
-
-Group:          Amusements/Graphics
-License:        GPLv2+
-URL:            https://sourceforge.net/projects/skychart/
-Source0:        %{name}_%{version}-source.tgz
-Source1:        skychart.desktop
-Patch1:         skychart-3.0.1.6-desktop.patch
-Patch2:         skychart-3.0.1.6-strip.patch
-Patch3:         skychart-wgetdoc.patch
+Name: skychart
+Version: 3.4
+Release: 1%{?dist}
+Summary: Planetarium software for the advanced amateur astronomer
+
+Group: Amusements/Graphics
+License: GPLv2+
+URL: http://www.ap-i.net/skychart/
+Source0: http://download.origo.ethz.ch/skychart/3239/skychart-%{version}-source.tgz
+Source1: http://download.origo.ethz.ch/skychart/2443/data_jpleph.tgz
+Patch1: skychart-3.4-desktop.patch
+Patch2: skychart-3.4-strip.patch
+Patch3: skychart-wgetdata.patch
+#Patch3: skychart-wgetdoc.patch
 
 # FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
 # no lazarus on s390(x)
 ExcludeArch:    ppc64 s390 s390x
 
 BuildRequires:  lazarus >= 0.9.30
-BuildRequires:  ImageMagick
-BuildRequires:  desktop-file-utils
-BuildRequires:  dos2unix
-BuildRequires:  gtk2-devel
-Requires:       xdg-utils
-Requires:       tzdata
+BuildRequires: ImageMagick desktop-file-utils dos2unix gtk2-devel
+BuildRequires: prelink
+Requires: xdg-utils tzdata
 
 %description
 This program enables you to draw sky charts, making use of the data in 16
@@ -37,12 +35,13 @@ of labels and coordinate grids, the superposition of pictures, the
 condition of visibility and more. All these features make this celestial
 atlas more complete than a conventional planetarium.
 
-
 %prep
-%setup -q -n %{name}_%{version}
-%patch1 -p1 -b .desktop
-%patch2 -p1 -b .strip
+%setup -q -n %{name}-%{version}-source
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
+cp -p %SOURCE1 BaseData
+
 find skychart -type f -print0 |xargs -0 chmod 644
 
 %build
@@ -55,9 +54,17 @@ make %{_smp_mflags} arch_flags="%{optflags}" -C skychart/library/plan404
 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*.txt
+dos2unix -q -k tools/doc/html_doc/en/feature_class_fichiers/common.css
+dos2unix -q -k tools/doc/html_doc/en/feature_class_fichiers/custom.css
+dos2unix -q -k tools/doc/releasenotes*.txt
+
+# Remove executable-stack to fix rpmlint warnings due to old Freepascal compiler
+# See upstream bug at http://www.ap-i.net/mantis/view.php?id=926
+# See Fedora bug at https://bugzilla.redhat.com/show_bug.cgi?id=771057
+execstack -c varobs/varobs
+execstack -c varobs/varobs_lpv_bulletin
+execstack -c skychart/cdc
+execstack -c skychart/cdcicon
 
 
 %install
@@ -76,12 +83,7 @@ chmod +x %{buildroot}%{_libdir}/*
 desktop-file-validate %{buildroot}%{_datadir}/applications/skychart.desktop
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc skychart/gpl.txt
 #%doc %{_datadir}/skychart/doc
 %{_bindir}/*
@@ -97,11 +99,14 @@ rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
 
 %changelog
+* Tue May 03 2011 Dan Horák <dan[at]danny.cz> - 3.4-1
+- New upstream source
+- New source with ephemeris
+
 * Tue May 03 2011 Dan Horák <dan[at]danny.cz> - 3.2-5
 - no lazarus on s390(x)
 
diff --git a/sources b/sources
index d0c1863..9e38e27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e215374ee11838bb686bb5c50625e7ee  skychart_3.2-source.tgz
+f945b649c218b77cd6fab4fb23c0a6ab  data_jpleph.tgz