rpms/xvarstar/F-10 xvarstar.spec, 1.1, 1.2 xvarstar-0.9-makefile.patch, 1.1, NONE

Lubomir Rintel lkundrak at fedoraproject.org
Mon Oct 27 10:28:28 UTC 2008


Author: lkundrak

Update of /cvs/pkgs/rpms/xvarstar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9864/F-10

Modified Files:
	xvarstar.spec 
Removed Files:
	xvarstar-0.9-makefile.patch 
Log Message:
Merge devel to branches


Index: xvarstar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xvarstar/F-10/xvarstar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xvarstar.spec	27 Oct 2008 09:49:26 -0000	1.1
+++ xvarstar.spec	27 Oct 2008 10:27:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xvarstar
 Version:	0.9
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	XVarStar is an astronomical program used for searching GCVS
 
 Group:		Applications/Engineering
@@ -8,10 +8,14 @@
 URL:		http://virtus.freeshell.org/%{name}/
 Source0:	http://virtus.freeshell.org/%{name}/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		%{name}-%{version}-makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	lesstif-devel desktop-file-utils
+BuildRequires:	desktop-file-utils
+%if 0%{?rhel}
+BuildRequires:	openmotif-devel
+%else
+BuildRequires:	lesstif-devel
+%endif
 
 %description
 XVarStar is a astronomical program written for variable star observers, and is
@@ -28,19 +32,17 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .patch
-aclocal
-automake-1.10 --no-force
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" \
+  sysconfdir="$RPM_BUILD_ROOT%{_sysconfdir}"
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} --vendor=fedora
@@ -59,6 +61,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
 %changelog
+* Mon Oct 27 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.9-4
+- Grab right Motif implementation
+- Remove the broken patch, fix sysconfdir path with make option
+- Honor optflags
+
 * Sun Sep  7 2008 <mmahut at fedoraproject.org> - 0.9-3
 - Fixing license tag at FUDCon Brno 2008
 


--- xvarstar-0.9-makefile.patch DELETED ---




More information about the fedora-extras-commits mailing list