rpms/skychart/F-10 skychart-3.0.1.5-config.patch, NONE, 1.1 skychart-3.0.1.5-paths.patch, NONE, 1.1 skychart-3.0.1.5-wl.patch, NONE, 1.1 skychart.desktop, NONE, 1.1 skychart.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Nov 6 01:35:51 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/skychart/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28675
Modified Files:
.cvsignore sources
Added Files:
skychart-3.0.1.5-config.patch skychart-3.0.1.5-paths.patch
skychart-3.0.1.5-wl.patch skychart.desktop skychart.spec
Log Message:
merge from devel to f10
skychart-3.0.1.5-config.patch:
--- NEW FILE skychart-3.0.1.5-config.patch ---
Replace various paths to those that suit Fedora well.
Not really interesting upstream.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- skychart-3.0.1.5/skychart/u_constant.pas.config 2008-10-18 16:20:58.000000000 +0200
+++ skychart-3.0.1.5/skychart/u_constant.pas 2008-10-29 20:16:30.000000000 +0100
@@ -272,9 +272,9 @@
DefaultFontSize=10;
DefaultPrivateDir='~/cartes_du_ciel';
Defaultconfigfile='~/.cartesduciel.ini';
- SharedDir='../share/apps/skychart';
- DefaultPrintCmd1='kghostview';
- DefaultPrintCmd2='gimp';
+ SharedDir='../share/skychart';
+ DefaultPrintCmd1='xdg-open';
+ DefaultPrintCmd2='xdg-open';
DefaultTmpDir='tmp';
Default_dssdrive='/mnt/cdrom';
DefaultVarObs='varobs';
@@ -620,11 +620,11 @@
{$ifdef darwin}
OpenFileCMD:string = 'open'; //
{$else}
- OpenFileCMD:string = 'kfmclient exec'; // default KDE
+ OpenFileCMD:string = 'xdg-open';
{$endif}
{$ifdef unix}
tracefile:string =''; // to stdout
- dcd_cmd: string = 'cd /usr/local/dcd ; python ./dcd.py';
+ dcd_cmd: string = 'dcd';
use_xplanet: boolean = true;
xplanet_dir: string = '';
{$endif}
--- skychart-3.0.1.5/skychart/pu_config_system.pas.config 2008-09-21 15:33:39.000000000 +0200
+++ skychart-3.0.1.5/skychart/pu_config_system.pas 2008-10-29 20:15:32.000000000 +0100
@@ -604,20 +604,8 @@
procedure Tf_config_system.LinuxDesktopBoxChange(Sender: TObject);
begin
if LockChange then exit;
-case LinuxDesktopBox.itemIndex of
- 0: begin // KDE
- LinuxCmd.Text:='kfmclient exec';
- LinuxCmd.Enabled:=false;
- end;
- 1: begin // GNOME
- LinuxCmd.Text:='gnome-open';
- LinuxCmd.Enabled:=false;
- end;
- 2: begin // Other
- LinuxCmd.Text:='/usr/bin/mozilla';
- LinuxCmd.Enabled:=true;
- end;
-end;
+LinuxCmd.Text:='xdg-open';
+LinuxCmd.Enabled:=true;
LinuxDesktop:=LinuxDesktopBox.itemIndex;
end;
--- skychart-3.0.1.5/tools/install_data.sh.config 2008-10-29 20:43:45.000000000 +0100
+++ skychart-3.0.1.5/tools/install_data.sh 2008-10-29 20:44:27.000000000 +0100
@@ -10,27 +10,27 @@
install -v -m 755 -d $destdir
install -v -m 755 -d $destdir/share
-install -v -m 755 -d $destdir/share/apps
-install -v -m 755 -d $destdir/share/apps/skychart
+install -v -m 755 -d $destdir/share
+install -v -m 755 -d $destdir/share/skychart
for f in $(sort dir.lst)
do
- install -v -m 755 -d $destdir/share/apps/skychart/$f
+ install -v -m 755 -d $destdir/share/skychart/$f
done
for f in $(cat data.lst)
do
- install -v -m 644 $f $destdir/share/apps/skychart/$f
+ install -v -m 644 $f $destdir/share/skychart/$f
done
for f in $(cat doc.lst)
do
- install -v -m 644 $f $destdir/share/apps/skychart/$f
+ install -v -m 644 $f $destdir/share/skychart/$f
done
for f in $(cat cat.lst)
do
- install -v -m 644 $f $destdir/share/apps/skychart/$f
+ install -v -m 644 $f $destdir/share/skychart/$f
done
-unzip -d $destdir/share/apps/skychart/doc/ doc/wiki_doc.zip
+unzip -d $destdir/share/skychart/doc/ doc/wiki_doc.zip
skychart-3.0.1.5-paths.patch:
--- NEW FILE skychart-3.0.1.5-paths.patch ---
Among other nonsenses, this includes the unit path of the right unzip
unit (fpc ships two different).
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- skychart-3.0.1.5/skychart/cdc.lpi.paths 2008-10-29 20:02:39.000000000 +0100
+++ skychart-3.0.1.5/skychart/cdc.lpi 2008-10-29 20:05:00.000000000 +0100
@@ -459,11 +459,11 @@
<CompilerOptions>
<Version Value="8"/>
<Target>
- <Filename Value="units/$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)/skychart"/>
+ <Filename Value="units/skychart"/>
</Target>
<SearchPaths>
- <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)-$(LCLWidgetType)"/>
- <SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/"/>
+ <OtherUnitFiles Value="/usr/lib/fpc/$(FPCVer)/units/$(TargetCPU)-$(TargetOS)/unzip/"/>
+ <UnitOutputDirectory Value="units/"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
skychart-3.0.1.5-wl.patch:
--- NEW FILE skychart-3.0.1.5-wl.patch ---
Case matters here.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
--- skychart-3.0.1.5/skychart/library/plan404/Makefile.wl 2008-10-10 15:15:59.000000000 +0200
+++ skychart-3.0.1.5/skychart/library/plan404/Makefile 2008-10-29 20:14:32.000000000 +0100
@@ -7,7 +7,7 @@
LIBFLAGS = -Wl,-single_module -dynamiclib -lc -lm
else
SO_Name = libplan404.so
-LIBFLAGS = -shared -WL,-soname,$(SO_Name) -lc -lm
+LIBFLAGS = -shared -Wl,-soname,$(SO_Name) -lc -lm
endif
.PHONY: clean
--- NEW FILE skychart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=SkyChart (Cartes du Ciel)
Comment=Planetarium software for the advanced amateur astronomer
GenericName=SkyChart
Exec=skychart %f
Icon=skychart
Categories=Graphics;Education;
Terminal=false
--- NEW FILE skychart.spec ---
Name: skychart
Version: 3.0.1.5
Release: 2.20081026svn%{?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
Group: Amusements/Graphics
License: GPLv2+
URL: https://sourceforge.net/projects/skychart/
Source0: %{name}-%{version}.tar.gz
Source1: skychart.desktop
Patch0: skychart-3.0.1.5-config.patch
Patch1: skychart-3.0.1.5-wl.patch
Patch2: skychart-3.0.1.5-paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
ExcludeArch: ppc64
BuildRequires: lazarus >= 0.9.26
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildRequires: dos2unix
Requires: xdg-utils
Requires: tzdata
%description
This program enables you to draw sky charts, making use of the data in 16
catalogs of stars and nebulae. In addition the position of planets,
asteroids and comets are shown.
The purpose of this program is to prepare different sky maps for a
particular observation. A large number of parameters help you to choose
specifically or automatically which catalogs to use, the colour and the
dimension of stars and nebulae, the representation of planets, the display
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
%{__unzip} -q tools/doc/wiki_doc.zip -d tools/doc
%patch0 -p1 -b .config
%patch1 -p1 -b .wl
%patch2 -p1 -b .paths
find . -type f -print0 |xargs -0 chmod 644
%build
lazbuild --primary-config-path=$PWD/.lazarus skychart/component/cdccomponents.lpk
lazbuild --primary-config-path=$PWD/.lazarus skychart/cdc.lpi
# TODO: more libraries. Only 404 seems essential though.
make %{_smp_mflags} CFLAGS="%{optflags} -fPIC" -C skychart/library/plan404
# Create the Icon Theme Specification compilant icon file
convert skychart/bitmaps/mainicon/mainicon.ico skychart.png
# 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
%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}
# Icon
install -pm 0644 skychart.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
# Menu entry
desktop-file-install --vendor=fedora %{SOURCE1} \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications
# 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
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/*.so
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/skychart/data
%{_datadir}/skychart/cat
%doc %{_datadir}/skychart/doc
%doc skychart/gpl.txt
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%changelog
* Thu Nov 06 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-2.20081026svn
- Temporarily disable ppc64 build due to a compiler bug
* Wed Oct 29 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-1.20081026svn
- Rebase to later upstream, since we have more recent fpc and lazarus now
* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.3-1.20071015svn
- Initial packaging attempt
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Nov 2008 22:29:53 -0000 1.1
+++ .cvsignore 6 Nov 2008 01:35:21 -0000 1.2
@@ -0,0 +1 @@
+skychart-3.0.1.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Nov 2008 22:29:53 -0000 1.1
+++ sources 6 Nov 2008 01:35:21 -0000 1.2
@@ -0,0 +1 @@
+d3158df6ad5f07f9f35ba8e43912767c skychart-3.0.1.5.tar.gz
More information about the fedora-extras-commits
mailing list