diff --git a/.gitignore b/.gitignore index 6e94af1..9faa936 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ skychart-3.0.1.6.tar.gz +/skychart_3.2-source.tgz diff --git a/skychart.spec b/skychart.spec index f67bfd3..89ca481 100644 --- a/skychart.spec +++ b/skychart.spec @@ -1,6 +1,6 @@ Name: skychart -Version: 3.0.1.6 -Release: 4.20100724svn%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: Planetarium software for the advanced amateur astronomer # svn export -r1351 https://svn.origo.ethz.ch/skychart/trunk@1351 skychart-3.0.1.6 @@ -9,10 +9,11 @@ Summary: Planetarium software for the advanced amateur astronomer Group: Amusements/Graphics License: GPLv2+ URL: https://sourceforge.net/projects/skychart/ -Source0: %{name}-%{version}.tar.gz +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916 @@ -41,9 +42,10 @@ atlas more complete than a conventional planetarium. %prep -%setup -q +%setup -q -n %{name}_%{version} %patch1 -p1 -b .desktop -%patch2 -p1 -b .strip +#%patch2 -p1 -b .strip +%patch3 -p1 find skychart -type f -print0 |xargs -0 chmod 644 @@ -57,14 +59,15 @@ 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 -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 %install rm -rf %{buildroot} +make install PREFIX=%{buildroot}%{_prefix} make install install_data PREFIX=%{buildroot}%{_prefix} # Fix multilib path @@ -83,6 +86,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) +#%doc skychart/gpl.txt +#%doc %{_datadir}/skychart/doc %{_bindir}/* %{_libdir}/*.so %{_datadir}/applications/* @@ -90,10 +95,9 @@ rm -rf %{buildroot} %dir %{_datadir}/skychart %{_datadir}/skychart/data %{_datadir}/skychart/cat -%doc %{_datadir}/skychart/doc -%exclude %{_datadir}/doc/skychart -%doc skychart/gpl.txt - +%{_datadir}/skychart/doc +%exclude /usr/share/doc/skychart/changelog +%exclude /usr/share/doc/skychart/copyright %post -p /sbin/ldconfig @@ -102,6 +106,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 12 2011 Sergio Pascual - 3.2.1-1 +- New upstream source + * Thu Jan 13 2011 Sergio Pascual - 3.0.1.6-4.20100724svn - Using d-f-validate instead od d-f-install (Fixes bz #662472) - Changed RPM_BUILD_ROOT macro to lower case form diff --git a/sources b/sources index 47b47de..d0c1863 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf5740ab05196d74a85ecab8247d84d8 skychart-3.0.1.6.tar.gz +e215374ee11838bb686bb5c50625e7ee skychart_3.2-source.tgz