rpms/justmoon/EL-6 justmoon.spec,1.4,1.5

Lubomir Rintel lkundrak at fedoraproject.org
Thu Jul 8 22:35:52 UTC 2010


Author: lkundrak

Update of /cvs/pkgs/rpms/justmoon/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4896

Modified Files:
	justmoon.spec 
Log Message:
* Fri Jul 09 2010 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-7
- Disable old GTK1 front end by default



Index: justmoon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/justmoon/EL-6/justmoon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- justmoon.spec	25 Jul 2009 04:13:38 -0000	1.4
+++ justmoon.spec	8 Jul 2010 22:35:51 -0000	1.5
@@ -1,6 +1,10 @@
+# Disable the gtk frontend by default, it depends on stuff
+# to be obsoleted soonish (and which is not in EPEL 6)
+%bcond_with gtk
+
 Name:           justmoon
 Version:        0.3.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Just Moon is lunar observing software for Linux
 
 Group:          Amusements/Graphics
@@ -16,14 +20,17 @@ Patch1:         justmoon-0.3.3-datadir.p
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt3-devel
+%if %with gtk
 BuildRequires:  gtk+-devel
 BuildRequires:  gdk-pixbuf-devel
+%endif
 BuildRequires:  desktop-file-utils
 
 %description
 %{summary}
 
 
+%if %with gtk
 %package gtk
 Summary:        GTK+ frontend for Just Moon, a lunar observing software
 Group:          Amusements/Graphics
@@ -32,6 +39,7 @@ Requires:       %{name}-common = %{versi
 %description gtk
 This package contains a lunar observing software with
 GTK+-based user interface that fits the GNOME Desktop environment.
+%endif
 
 
 %package qt
@@ -63,7 +71,11 @@ justmoon-qt or justmoon-gtk package.
 %build
 make %{?_smp_mflags}                                            \
         'CFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"' \
-        'CXXFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"'
+        'CXXFLAGS=%{optflags} -DDATADIR=\"%{_datadir}/%{name}/\"' \
+%if %with gtk
+        gmoon \
+%endif
+        qmoon
 
 
 %install
@@ -71,9 +83,11 @@ 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}
+%if %with gtk
 desktop-file-install --vendor="fedora"                          \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
         %{SOURCE1}
+%endif
 desktop-file-install --vendor="fedora"                          \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
         %{SOURCE2}
@@ -90,10 +104,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc README
 
 
+%if %with gtk
 %files gtk
 %defattr(-,root,root,-)
 %{_bindir}/gmoon
 %{_datadir}/applications/fedora-justmoon-gmoon.desktop
+%endif
 
 
 %files qt
@@ -103,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 09 2010 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.3-7
+- Disable old GTK1 front end by default
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list