rpms/justmoon/devel import.log, NONE, 1.1 justmoon-0.3.3-datadir.patch, NONE, 1.1 justmoon-0.3.3-parenth.patch, NONE, 1.1 justmoon-gmoon.desktop, NONE, 1.1 justmoon-qmoon.desktop, NONE, 1.1 justmoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Marek Mahut
mmahut at fedoraproject.org
Fri Sep 5 14:24:38 UTC 2008
Author: mmahut
Update of /cvs/pkgs/rpms/justmoon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10924/devel
Modified Files:
.cvsignore sources
Added Files:
import.log justmoon-0.3.3-datadir.patch
justmoon-0.3.3-parenth.patch justmoon-gmoon.desktop
justmoon-qmoon.desktop justmoon.spec
Log Message:
initial import
--- NEW FILE import.log ---
justmoon-0_3_3-3_el5:HEAD:justmoon-0.3.3-3.el5.src.rpm:1220624188
justmoon-0.3.3-datadir.patch:
--- NEW FILE justmoon-0.3.3-datadir.patch ---
We pass DATADIR from CFLAGS
Lubomir Rintel <lkundrak at v3.sk>
--- justmoon-0.3.3/include/MoonFeature.h.datadir 2008-09-05 11:58:25.000000000 +0200
+++ justmoon-0.3.3/include/MoonFeature.h 2008-09-05 11:58:37.000000000 +0200
@@ -9,9 +9,6 @@
#ifndef MOONFEATURE_H
#define MOONFEATURE_H
-// Where the data files live:
-#define DATADIR "/usr/local/qmoon/"
-
class MoonCanvas;
class MoonFeature
justmoon-0.3.3-parenth.patch:
--- NEW FILE justmoon-0.3.3-parenth.patch ---
Fix build with gcc-4.1
Lubomir Rintel <lkundrak at v3.sk>
--- justmoon-0.3.3/libmoon/MoonFeature.cpp.parenth 2008-09-05 11:44:51.000000000 +0200
+++ justmoon-0.3.3/libmoon/MoonFeature.cpp 2008-09-05 11:45:08.000000000 +0200
@@ -128,7 +128,7 @@
// Delete the old moonFeature list:
if (sMoonFeatureList)
DeleteFeatures();
- sMoonFeatureList = new (MoonFeature*)[2000];
+ sMoonFeatureList = new MoonFeature*[2000];
sNumFeatures = 0;
--- NEW FILE justmoon-gmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=gmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=KDE;
--- NEW FILE justmoon-qmoon.desktop ---
[Desktop Entry]
Name=Just Moon
Comment=Lunar observing software
GenericName=Just Moon
Exec=qmoon
Icon=/usr/share/justmoon/fullmoon
Type=Application
Categories=Education;Game;Astronomy;Science;
NotShowIn=GNOME;
--- NEW FILE justmoon.spec ---
Name: justmoon
Version: 0.3.3
Release: 3%{?dist}
Summary: Just Moon is lunar observing software for Linux
Group: Amusements/Graphics
License: GPL+
URL: http://www.shallowsky.com/software/justmoon/
Source0: http://www.shallowsky.com/software/justmoon/%{name}-%{version}.tar.gz
Source1: justmoon-gmoon.desktop
Source2: justmoon-qmoon.desktop
# Not sent to upstream yet
Patch0: justmoon-0.3.3-parenth.patch
# Not upstreamable
Patch1: justmoon-0.3.3-datadir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt3-devel
BuildRequires: gtk+-devel
BuildRequires: gdk-pixbuf-devel
BuildRequires: desktop-file-utils
%description
%{summary}
%package gtk
Summary: GTK+ frontend for Just Moon, a lunar observing software
Group: Amusements/Graphics
Requires: %{name}-common = %{version}
%description gtk
This package contains a lunar observing software with
GTK+-based user interface that fits the GNOME Desktop environment.
%package qt
Summary: QT frontend for Just Moon, a lunar observing software
Group: Amusements/Graphics
Requires: %{name}-common = %{version}
%description qt
This package contains a lunar observing software with
QT-based user interface that fits the KDE Desktop environment.
%package common
Summary: Data files for Just Moon, a lunar observing software
Group: Amusements/Graphics
%description common
This package contains data file for a lunar observing software Just Moon.
In order to actually use Just Moon you need a graphical frontend from
justmoon-qt or justmoon-gtk package.
%prep
%setup -q
%patch0 -p1 -b .parenth
%patch1 -p1 -b .datadir
%build
make %{?_smp_mflags} \
'CFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"' \
'CXXFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"'
%install
rm -rf $RPM_BUILD_ROOT
make installdata INSTALLDIR=$RPM_BUILD_ROOT/%{_datadir}/%{name}
make -C gmoon install INSTALLPREFIX=$RPM_BUILD_ROOT/%{_prefix}
install -p -m 0755 qmoon/qmoon $RPM_BUILD_ROOT/%{_bindir}
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE1}
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
%{SOURCE2}
%clean
rm -rf $RPM_BUILD_ROOT
%files common
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%attr(0644,root,root) %{_datadir}/%{name}/*
%doc README
%files gtk
%defattr(-,root,root,-)
%{_bindir}/gmoon
%{_datadir}/applications/fedora-justmoon-gmoon.desktop
%files qt
%defattr(-,root,root,-)
%{_bindir}/qmoon
%{_datadir}/applications/fedora-justmoon-qmoon.desktop
%changelog
* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-3
- Yet more review fixes, thanks to yet another Marek Mahut
* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-2
- Integrate review fixes, thanks to Marek Mahut
* Fri Sep 05 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-1
- Initial packaging attempt
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Sep 2008 13:36:40 -0000 1.1
+++ .cvsignore 5 Sep 2008 14:24:08 -0000 1.2
@@ -0,0 +1 @@
+justmoon-0.3.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Sep 2008 13:36:40 -0000 1.1
+++ sources 5 Sep 2008 14:24:08 -0000 1.2
@@ -0,0 +1 @@
+3007c84e3b5232c0dba9f5c0b5c3a669 justmoon-0.3.3.tar.gz
More information about the scm-commits
mailing list