Author: lkundrak
Update of /cvs/pkgs/rpms/skychart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27439
Modified Files:
skychart.spec
Added Files:
skychart-3.0.1.6-wl.patch
Removed Files:
skychart-3.0.1.5-config.patch skychart-3.0.1.5-paths.patch
skychart-3.0.1.5-wl.patch
Log Message:
* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.6-1.20090408svn
- Update to post latest beta
- Drop the unzip patch
- Upstream did the datadir and xdg-open chage as well, drop patches
skychart-3.0.1.6-wl.patch:
--- NEW FILE skychart-3.0.1.6-wl.patch ---
Case matters here.
Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
[?25l[J[J[J[?12l[?25h[?1049h[?1h=[1;42r[?12;25h[?12l[?25h[27m[m[H[2J[?25l[42;1HW10: Warning: Changing a readonly file[2;1H[1m[34m~ [3;1H~ [4;1H~ [5;1H~ [6;1H~ [7;1H~
[8;1H~ [9;1H~ [10;1H~ [11;1H~ [12;1H~ [13;1H~ [14;1H~
[15;1H~ [16;1H~ [17;1H~ [18;1H~ [19;1H~ [20;1H~
[21;1H~ [22;1H~ [23;1H~ [24;1H~ [25;1H~ [26;1H~ [27;1H~
[28;1H~ [29;1H~ [30;1H~ [31;1H~ [32;1H~ [33;1H~ [34;1H~
[35;1H~ [36;1H~ [37;1H~ [38;1H~ [39;1H~ [40;1H~
[41;1H~ [1;1H[?12l[?25h[?25l[m[42;1H[K[42;1H:[?12l[?25hq[?25l[?12l[?25h![?25l[?12l[?25h[34m^Z[?25l[?12l[?25h^Z[?25l[?12l[?25h
[?25l[m[1m[37m[41mE488: Trailing characters[1;1H[?12l[?25h[?25l[m[42;1HType :quit<Enter> to exit Vim[1;1H[?12l[?25hdiff -up skychart-3.0.1.6/skychart/library/plan404/Makefile.wl skychart-3.0.1.6/skychart/library/plan404/Makefile
--- skychart-3.0.1.6/skychart/library/plan404/Makefile.wl 2009-04-08 21:15:05.027791300 +0200
+++ skychart-3.0.1.6/skychart/library/plan404/Makefile 2009-04-08 21:15:28.892791702 +0200
@@ -8,7 +8,7 @@ SO_Name = libplan404.dylib
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
ifneq ($(findstring W32,$(OSTYPE)),)
SO_Name = libplan404.dll
[?25l[?12l[?25h[42;1H[?1l>[?1049lVim: Error reading input, exiting...
Vim: preserving files...
Vim: Finished.
[42;1H
Index: skychart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/skychart/devel/skychart.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- skychart.spec 8 Apr 2009 18:51:59 -0000 1.13
+++ skychart.spec 8 Apr 2009 19:27:32 -0000 1.14
@@ -1,6 +1,6 @@
Name: skychart
-Version: 3.0.1.5
-Release: 6.20081026svn%{?dist}
+Version: 3.0.1.6
+Release: 1.20090408svn%{?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
@@ -9,11 +9,9 @@
Group: Amusements/Graphics
License: GPLv2+
URL: https://sourceforge.net/projects/skychart/
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.lzma
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
+Patch1: skychart-3.0.1.6-wl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# FIXME: http://koji.fedoraproject.org/koji/taskinfo?taskID=918916
@@ -45,9 +43,7 @@
%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
@@ -99,7 +95,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/skychart
# Binary
-install -pm 0755 skychart/units/skychart \
+install -pm 0755 skychart/units/*/skychart \
$RPM_BUILD_ROOT%{_bindir}
# Libraries
@@ -148,6 +144,11 @@
%changelog
+* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.6-1.20090408svn
+- Update to post latest beta
+- Drop the unzip patch
+- Upstream did the datadir and xdg-open chage as well, drop patches
+
* Wed Apr 08 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 3.0.1.5-6.20081026svn
- Enable GTK2 UI
--- skychart-3.0.1.5-config.patch DELETED ---
--- skychart-3.0.1.5-paths.patch DELETED ---
--- skychart-3.0.1.5-wl.patch DELETED ---