[jimtcl/f20] update to 0.74

Markus Mayer lotharlutz at fedoraproject.org
Sat Sep 7 16:06:38 UTC 2013 

commit e7e16257aa8c1e01070241aefcf7582a0e0b142f
Author: Markus Mayer <lotharlutz at gmx.de>
Date:   Sat Sep 7 18:05:43 2013 +0200

    update to 0.74

 .gitignore                               |    1 +
 jimtcl-add_soname.patch                  |   36 ------------
 jimtcl-dont_delete_source_files.patch    |   12 ----
 jimtcl-fix_doc_paths.patch               |   87 ++++++++++++------------------
 jimtcl-fix_hardcoded_install_paths.patch |   63 ---------------------
 jimtcl.spec                              |   25 ++++-----
 sources                                  |    2 +-
 7 files changed, 48 insertions(+), 178 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a843b98..538fe05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jimtcl-0.73-ac3f1cd.tar.gz
+/jimtcl-0.74-7c126ab.tar.gz
diff --git a/jimtcl-fix_doc_paths.patch b/jimtcl-fix_doc_paths.patch
index 986ac40..4bf8aa9 100644
--- a/jimtcl-fix_doc_paths.patch
+++ b/jimtcl-fix_doc_paths.patch
@@ -1,53 +1,34 @@
-*** Makefile.in	2013-05-05 10:16:26.291343381 +0200
---- Makefile.in	2013-05-05 10:19:10.609071066 +0200
-***************
-*** 68,80 ****
-  install: all docs @TCL_EXTS@ install-exec
-  	mkdir -p $(DESTDIR)@libdir@/jim
-  	cp $(LIBJIM) $(DESTDIR)@libdir@
-- 	cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ $(DESTDIR)@libdir@/jim
-  	mkdir -p $(DESTDIR)@includedir@
-  	cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
-  		@srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)@includedir@
-  	cp jim-config.h $(DESTDIR)@includedir@
-! 	mkdir -p $(DESTDIR)@datadir@/doc/jim
-! 	cp Tcl.html $(DESTDIR)@datadir@/doc/jim
-  	mkdir -p $(DESTDIR)@bindir@
-  	cp build-jim-ext $(DESTDIR)@bindir@
-  
---- 68,80 ----
-  install: all docs @TCL_EXTS@ install-exec
-  	mkdir -p $(DESTDIR)@libdir@/jim
-  	cp $(LIBJIM) $(DESTDIR)@libdir@
-  	mkdir -p $(DESTDIR)@includedir@
-  	cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
-  		@srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)@includedir@
-  	cp jim-config.h $(DESTDIR)@includedir@
-! 	mkdir -p $(DESTDIR)@datadir@/doc/jimtcl
-! 	cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ $(DESTDIR)@datadir@/doc/jimtcl
-! 	cp Tcl.html $(DESTDIR)@datadir@/doc/jimtcl
-  	mkdir -p $(DESTDIR)@bindir@
-  	cp build-jim-ext $(DESTDIR)@bindir@
-  
-***************
-*** 86,94 ****
-  	rm -f $(DESTDIR)@bindir@/$(JIMSH)
-  	rm -f $(DESTDIR)@bindir@/build-jim-ext
-  	rm -f $(DESTDIR)@libdir@/$(LIBJIM)
-! 	for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@libdir@/jim/$$i; done
-  	rm -f $(DESTDIR)@includedir@/jim*.h
-! 	rm -f $(DESTDIR)@datadir@/doc/jim/Tcl.html
-  @else
-  install install-exec: all
-  uninstall:
---- 86,95 ----
-  	rm -f $(DESTDIR)@bindir@/$(JIMSH)
-  	rm -f $(DESTDIR)@bindir@/build-jim-ext
-  	rm -f $(DESTDIR)@libdir@/$(LIBJIM)
-! 	for i in @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@libdir@/jim/$$i; done
-  	rm -f $(DESTDIR)@includedir@/jim*.h
-! 	rm -f $(DESTDIR)@datadir@/doc/jimtcl/README.extensions
-! 	rm -f $(DESTDIR)@datadir@/doc/jimtcl/Tcl.html
-  @else
-  install install-exec: all
-  uninstall:
+--- Makefile.in	2013-07-24 07:36:47.000000000 +0200
++++ Makefile.in	2013-09-07 17:49:59.196983126 +0200
+@@ -63,8 +63,8 @@
+ 
+ @if JIM_DOCS
+ install-docs: docs
+-	mkdir -p $(DESTDIR)$(prefix)/doc/jim
+-	cp Tcl.html $(DESTDIR)$(prefix)/doc/jim
++	mkdir -p $(DESTDIR)@datadir@/doc/jimtcl
++	cp Tcl.html $(DESTDIR)@datadir@/doc/jimtcl
+ @else
+ install-docs:
+ @endif
+@@ -76,7 +76,7 @@
+ install: all @TCL_EXTS@ install-exec install-docs
+ 	mkdir -p $(DESTDIR)@libdir@/jim
+ 	cp $(LIBJIM) $(DESTDIR)@libdir@
+-	cp @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@libdir@/jim
++	cp @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@datadir@/doc/jimtcl
+ 	for i in @TCL_EXTS@; do cp @srcdir@/$$i $(DESTDIR)@libdir@/jim; done
+ 	mkdir -p $(DESTDIR)@includedir@
+ 	cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
+@@ -93,9 +93,9 @@
+ 	rm -f $(DESTDIR)@bindir@/$(JIMSH)
+ 	rm -f $(DESTDIR)@bindir@/build-jim-ext
+ 	rm -f $(DESTDIR)@libdir@/$(LIBJIM)
+-	for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@libdir@/jim/$$i; done
++	for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@datadir@/doc/jimtcl/$$i; done
+ 	rm -f $(DESTDIR)@includedir@/jim*.h
+-	rm -f $(DESTDIR)@datadir@/doc/jim/Tcl.html
++	rm -f $(DESTDIR)@datadir@/doc/jimtcl/Tcl.html
+ @else
+ install install-exec: all
+ uninstall:
diff --git a/jimtcl.spec b/jimtcl.spec
index 9448ae6..c58da58 100644
--- a/jimtcl.spec
+++ b/jimtcl.spec
@@ -1,19 +1,16 @@
-%global commit ac3f1cd082ba21a55edaabd826580996f5b77595
+%global commit 7c126ab08220024b7dfe293045e6ee4d0bb3ca95
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           jimtcl
-Version:        0.73
-Release:        5%{?dist}
+Version:        0.74
+Release:        1%{?dist}
 Summary:        A small embeddable Tcl interpreter
 
 License:        BSD
 Group:          Development/Languages
 URL:            http://jim.tcl.tk
 Source0:        https://github.com/msteveb/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-Patch0:         jimtcl-dont_delete_source_files.patch
-Patch1:         jimtcl-fix_hardcoded_install_paths.patch
-Patch2:         jimtcl-fix_doc_paths.patch
-Patch3:         jimtcl-add_soname.patch
+Patch0:         jimtcl-fix_doc_paths.patch
 
 BuildRequires:  asciidoc 
 #Requires:       
@@ -37,9 +34,6 @@ developing applications that use %{name}.
 %prep
 %setup -qn %{name}-%{commit}
 %patch0
-%patch1
-%patch2
-%patch3
 iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new
 mv AUTHORS.new AUTHORS
 iconv --from=ISO-8859-1 --to=UTF-8 LICENSE > LICENSE.new
@@ -83,6 +77,11 @@ popd
 %{_libdir}/libjim.so
 
 %changelog
+* Sat Sep 07 2013 Markus Mayer <lotharlutz at gmx.de> - 0.74-1
+- new upstream release 0.74
+- drop patches merges upstream
+- rebase jimtcl-fix_doc_paths.patch
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.73-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -96,10 +95,10 @@ popd
 * Sun May 05 2013 Markus Mayer <lotharlutz at gmx.de> - 0.73-2
 - fix source url
 - convert LICENSE and AUTHORS to UTF-8
-- remove not needed '%defattr(-,root,root,-)' and 'rm -rf $RPM_BUILD_ROOT'
+- remove not needed 'defattr(-,root,root,-)' and 'rm -rf $RPM_BUILD_ROOT'
 - add add soname to lib(jimtcl-add_soname.patch)
-- add README.* files to %doc
-- add STYLE file to %doc
+- add README.* files to doc
+- add STYLE file to doc
 
 * Sun May 05 2013 Markus Mayer <lotharlutz at gmx.de> - 0.73-1
 - inital prm release
diff --git a/sources b/sources
index ad503c7..1795f1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c584f03081e5fc3fb65d648fc8662ddd  jimtcl-0.73-ac3f1cd.tar.gz
+2958716df907132dd1636eaa4ee145a3  jimtcl-0.74-7c126ab.tar.gz

More information about the scm-commits mailing list