[jimtcl/epel7] update to upstream 0.75

Markus Mayer lotharlutz at fedoraproject.org
Sun Mar 2 11:36:53 UTC 2014


commit 34bf57d9c22e1bc19923ebe6cae3962384b8ca44
Author: Markus Mayer <lotharlutz at gmx.de>
Date:   Sun Mar 2 12:36:56 2014 +0100

    update to upstream 0.75

 .gitignore                 |    1 +
 jimtcl-fix_doc_paths.patch |   32 ++++++++++++++++----------------
 jimtcl.spec                |   14 +++++++-------
 sources                    |    2 +-
 4 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 538fe05..aab16af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jimtcl-0.73-ac3f1cd.tar.gz
 /jimtcl-0.74-7c126ab.tar.gz
+/jimtcl-0.75-769d198.tar.gz
diff --git a/jimtcl-fix_doc_paths.patch b/jimtcl-fix_doc_paths.patch
index 4bf8aa9..6c25bfd 100644
--- a/jimtcl-fix_doc_paths.patch
+++ b/jimtcl-fix_doc_paths.patch
@@ -1,26 +1,26 @@
---- Makefile.in	2013-07-24 07:36:47.000000000 +0200
-+++ Makefile.in	2013-09-07 17:49:59.196983126 +0200
-@@ -63,8 +63,8 @@
+--- Makefile.in	2014-02-06 02:33:28.000000000 +0100
++++ Makefile.in	2014-03-02 11:54:06.038698481 +0100
+@@ -72,8 +72,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
+-	$(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/doc/jim
+-	$(INSTALL_DATA) Tcl.html $(DESTDIR)$(prefix)/doc/jim
++	$(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jimtcl
++	$(INSTALL_DATA) Tcl.html $(DESTDIR)@datadir@/doc/jimtcl
  @else
  install-docs:
  @endif
-@@ -76,7 +76,7 @@
+@@ -85,7 +85,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 @@
+ 	$(INSTALL_DATA_DIR) $(DESTDIR)@libdir@/jim
+ 	$(INSTALL_DATA) $(LIBJIM) $(DESTDIR)@libdir@
+-	$(INSTALL_DATA) @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@libdir@/jim
++	$(INSTALL_DATA) @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@datadir@/doc/jimtcl
+ 	for i in @TCL_EXTS@; do $(INSTALL_DATA) @srcdir@/$$i $(DESTDIR)@libdir@/jim; done
+ 	$(INSTALL_DATA_DIR) $(DESTDIR)@includedir@
+ 	$(INSTALL_DATA) @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
+@@ -102,9 +102,9 @@
  	rm -f $(DESTDIR)@bindir@/$(JIMSH)
  	rm -f $(DESTDIR)@bindir@/build-jim-ext
  	rm -f $(DESTDIR)@libdir@/$(LIBJIM)
diff --git a/jimtcl.spec b/jimtcl.spec
index c58da58..63963df 100644
--- a/jimtcl.spec
+++ b/jimtcl.spec
@@ -1,8 +1,8 @@
-%global commit 7c126ab08220024b7dfe293045e6ee4d0bb3ca95
+%global commit 769d198e1e1ea936d21523bb1b301255dc79233e
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           jimtcl
-Version:        0.74
+Version:        0.75
 Release:        1%{?dist}
 Summary:        A small embeddable Tcl interpreter
 
@@ -34,11 +34,6 @@ developing applications that use %{name}.
 %prep
 %setup -qn %{name}-%{commit}
 %patch0
-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
-mv LICENSE.new LICENSE
-
 
 %build
 #configure is not able to locate the needed binaries, so specify it manualy
@@ -77,6 +72,11 @@ popd
 %{_libdir}/libjim.so
 
 %changelog
+* Sat Mar 01 2014 Markus Mayer <lotharlutz at gmx.de> - 0.75-1
+- new upstream release 0.75
+- rebase jimtcl-fix_doc_paths.patch
+- drop utf-8 conversion in prep (upstream uses utf now)
+
 * Sat Sep 07 2013 Markus Mayer <lotharlutz at gmx.de> - 0.74-1
 - new upstream release 0.74
 - drop patches merges upstream
diff --git a/sources b/sources
index 1795f1d..724aeb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2958716df907132dd1636eaa4ee145a3  jimtcl-0.74-7c126ab.tar.gz
+93982d4a72924842fabfaaa6ee58a1d5  jimtcl-0.75-769d198.tar.gz


More information about the scm-commits mailing list