rpms/tkcon/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tkcon.spec, 1.6, 1.7

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/tkcon/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7422

Modified Files:
	.cvsignore sources tkcon.spec 
Log Message:
Update to CVS head for ds9 (BZ #445879)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcon/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2005 17:23:04 -0000	1.2
+++ .cvsignore	12 Jun 2008 06:05:17 -0000	1.3
@@ -1 +1 @@
-tkcon-2.4.tar.gz
+tkcon-20080610cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcon/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2005 17:23:04 -0000	1.2
+++ sources	12 Jun 2008 06:05:17 -0000	1.3
@@ -1 +1 @@
-415905fe3d81aa957f9c4424c219784e  tkcon-2.4.tar.gz
+07b67406fef043eed315f872705a2cdc  tkcon-20080610cvs.tgz


Index: tkcon.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcon/F-9/tkcon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tkcon.spec	27 Aug 2007 05:16:20 -0000	1.6
+++ tkcon.spec	12 Jun 2008 06:05:17 -0000	1.7
@@ -1,15 +1,24 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
+%define cvsdate 20080610
+
 Name:           tkcon
-Version:        2.4
-Release:        6%{?dist}
+Version:        2.5
+Release:        1.%{cvsdate}cvs%{?dist}
 Summary:        Tcl GUI console
 
+# cvs -z3 -d:pserver:anonymous at tkcon.cvs.sourceforge.net:/cvsroot/tkcon export -D 2008-06-10 -d tkcon-20080610cvs tkcon
+# tar czf tkcon-20080610cvs.tgz ./tkcon-20080610cvs
 Group:          Development/Tools
 License:        TCL
 URL:            http://tkcon.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/tkcon/tkcon-2.4.tar.gz
+Source0:        tkcon-%{cvsdate}cvs.tgz
 Source1:        tkcon.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  tcl-devel
+Requires: tcl(abi) = 8.5 tk
+
 BuildArch: noarch
 BuildRequires: desktop-file-utils
 Requires:  tk
@@ -22,12 +31,11 @@
 in the Mac and Windows Tk.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{cvsdate}cvs
+chmod a-x docs/*.* index.html
 rm docs/*.txt
 mv docs/license.terms .
 
-sed -i 's,\r$,,' release.txt
-
 %build
 # Nothing to build!
 
@@ -35,6 +43,9 @@
 rm -rf $RPM_BUILD_ROOT
 install -pD -m 0755 tkcon.tcl $RPM_BUILD_ROOT/%{_bindir}/tkcon
 
+install -pD -m 0644 tkcon.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/tkcon-%{version}/tkcon.tcl
+install -pD -m 0644 pkgIndex.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/tkcon-%{version}/pkgIndex.tcl
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         %{SOURCE1}
@@ -45,10 +56,14 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
+%{tcl_sitelib}/%{name}-%{version}
 %{_datadir}/applications/*.desktop
-%doc license.terms README.txt release.txt index.html docs
+%doc license.terms README.txt index.html docs
 
 %changelog
+* Tue Jun 10 2008 Wart <wart at kobold.org> - 2.5-1.20080610cvs
+- Update to CVS head for ds9 (BZ #445879)
+
 * Sun Aug 26 2007 Wart <wart at kobold.org> - 2.4-6
 - License tag clarification