rpms/ds9/F-9 ds9-notags.patch, NONE, 1.1 ds9.spec, 1.11, 1.12 ds9-tkcon.patch, 1.1, NONE ds9.README.fedora, 1.1, NONE
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Thu Jun 12 16:17:09 UTC 2008
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2842
Modified Files:
ds9.spec
Added Files:
ds9-notags.patch
Removed Files:
ds9-tkcon.patch ds9.README.fedora
Log Message:
* Thu Jun 12 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-3
- Removing dependency in etags
- Using tkcon
ds9-notags.patch:
--- NEW FILE ds9-notags.patch ---
diff -ur saods9/saotk/colorbar/Makefile saods9.etags/saotk/colorbar/Makefile
--- saods9/saotk/colorbar/Makefile 2007-12-05 20:00:03.000000000 +0100
+++ saods9.etags/saotk/colorbar/Makefile 2008-06-12 06:18:26.000000000 +0200
@@ -33,7 +33,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/fitsy++/Makefile saods9.etags/saotk/fitsy++/Makefile
--- saods9/saotk/fitsy++/Makefile 2007-12-28 23:07:11.000000000 +0100
+++ saods9.etags/saotk/fitsy++/Makefile 2008-06-12 06:18:50.000000000 +0200
@@ -47,7 +47,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/frame/Makefile saods9.etags/saotk/frame/Makefile
--- saods9/saotk/frame/Makefile 2008-03-18 19:39:38.000000000 +0100
+++ saods9.etags/saotk/frame/Makefile 2008-06-12 06:19:13.000000000 +0200
@@ -96,7 +96,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/list/Makefile saods9.etags/saotk/list/Makefile
--- saods9/saotk/list/Makefile 2007-12-05 20:00:03.000000000 +0100
+++ saods9.etags/saotk/list/Makefile 2008-06-12 06:19:40.000000000 +0200
@@ -8,7 +8,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/magnifier/Makefile saods9.etags/saotk/magnifier/Makefile
--- saods9/saotk/magnifier/Makefile 2007-12-05 20:00:03.000000000 +0100
+++ saods9.etags/saotk/magnifier/Makefile 2008-06-12 06:20:04.000000000 +0200
@@ -16,7 +16,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/panner/Makefile saods9.etags/saotk/panner/Makefile
--- saods9/saotk/panner/Makefile 2007-12-05 20:00:03.000000000 +0100
+++ saods9.etags/saotk/panner/Makefile 2008-06-12 06:20:17.000000000 +0200
@@ -16,7 +16,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/util/Makefile saods9.etags/saotk/util/Makefile
--- saods9/saotk/util/Makefile 2008-03-25 23:13:10.000000000 +0100
+++ saods9.etags/saotk/util/Makefile 2008-06-12 06:20:37.000000000 +0200
@@ -20,7 +20,7 @@
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/vector/Makefile saods9.etags/saotk/vector/Makefile
--- saods9/saotk/vector/Makefile 2007-12-05 20:00:03.000000000 +0100
+++ saods9.etags/saotk/vector/Makefile 2008-06-12 06:20:51.000000000 +0200
@@ -7,7 +7,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
diff -ur saods9/saotk/widget/Makefile saods9.etags/saotk/widget/Makefile
--- saods9/saotk/widget/Makefile 2007-12-05 20:00:03.000000000 +0100
+++ saods9.etags/saotk/widget/Makefile 2008-06-12 06:21:03.000000000 +0200
@@ -10,7 +10,7 @@
INCLS = $(wildcard *.h)
OBJS = $(SRC:%.C=%.o)
-all : $(OBJS) TAGS
+all : $(OBJS)
clean : FORCE
rm -f core *~ *#
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/F-9/ds9.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ds9.spec 30 May 2008 08:43:05 -0000 1.11
+++ ds9.spec 12 Jun 2008 16:16:21 -0000 1.12
@@ -1,6 +1,6 @@
Name: ds9
Version: 5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -9,7 +9,6 @@
Source0: http://hea-www.harvard.edu/RD/ds9/%{name}.%{version}.tar.gz
Source1: ds9.desktop
Source2: ds9.make.fedora
-Source3: ds9.README.fedora
Patch0: ds9-main.patch
Patch1: ds9-fitsy.patch
Patch2: ds9-frame.patch
@@ -19,18 +18,16 @@
Patch6: ds9-src.patch
Patch7: ds9-tcl85.patch
Patch8: ds9-gcc43.patch
-Patch9: ds9-tkcon.patch
+Patch9: ds9-notags.patch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: zlib-devel funtools-devel
BuildRequires: blt-devel tk-devel
-# This package is required for etags
-BuildRequires: emacs-common
BuildRequires: desktop-file-utils
-Requires: tcllib tktable tkimg xpa-tcl
+Requires: tcllib tktable tkimg xpa-tcl tkcon >= 2.5
%description
SAOImage DS9 is an astronomical imaging and data visualization application.
@@ -57,7 +54,6 @@
echo LIBDIR="%{_libdir}" >> make.include
echo OPTS="%{optflags}" >> make.include
%{__make} %{_smp_mflags}
-%{__cp} %{SOURCE3} README.fedora
%install
%{__rm} -fr %{buildroot}
@@ -80,7 +76,7 @@
%{__rm} -fr %{buildroot}
%files
-%doc COPYING copyright README.fedora
+%doc COPYING copyright
%defattr(-,root,root,-)
%{_bindir}/*
%{_datadir}/applications/*
@@ -96,6 +92,10 @@
%changelog
+* Thu Jun 12 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-3
+- Removing dependency in etags
+- Using tkcon
+
* Fri May 30 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.2-2
- Updated gcc 4.3 patch
--- ds9-tkcon.patch DELETED ---
--- ds9.README.fedora DELETED ---
More information about the fedora-extras-commits
mailing list