krege pushed to tkabber (f21). "Fix patch"

[notifications at fedoraproject.org]

>From 643a109ab51c3373c79e4a85eac164818608f3aa Mon Sep 17 00:00:00 2001
From: "Dmitrij S. Kryzhevich" <krege at land.ru>
Date: Wed, 1 Apr 2015 10:39:38 +0600
Subject: Fix patch


diff --git a/tkabber-1.0-install.patch b/tkabber-1.0-install.patch
deleted file mode 100644
index 74bd924..0000000
--- a/tkabber-1.0-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urp tkabber-1.0/Makefile tkabber-1.0-install/Makefile
---- tkabber-1.0/Makefile	2014-01-01 01:00:30.963192000 +0700
-+++ tkabber-1.0-install/Makefile	2014-01-28 10:34:37.470280712 +0700
-@@ -1,6 +1,6 @@
- # $Id: Makefile 2048 2013-12-31 18:00:30Z sergei $
- 
--PREFIX = /usr/local
-+PREFIX = /usr
- TKABBERDIR = $(PREFIX)/share/tkabber
- DOCDIR = $(PREFIX)/share/doc/tkabber
- BINDIR = $(PREFIX)/bin
-@@ -33,13 +33,6 @@ install-bin:
- 	cp -dr --no-preserve=ownership *.tcl $(SUBDIRS) $(DESTDIR)$(TKABBERDIR)
- 	chmod 755 $(DESTDIR)$(TKABBERDIR)/tkabber.tcl
- 	chmod 755 $(DESTDIR)$(TKABBERDIR)/tkabber-remote.tcl
--	install -d $(DESTDIR)$(BINDIR)
--	echo "#!/bin/sh" >$(DESTDIR)$(BINDIR)/tkabber
--	echo "exec $(TKABBERDIR)/tkabber.tcl \"\$$@\"" >>$(DESTDIR)$(BINDIR)/tkabber
--	echo "#!/bin/sh" >$(DESTDIR)$(BINDIR)/tkabber-remote
--	echo "exec $(TKABBERDIR)/tkabber-remote.tcl \"\$$@\"" >>$(DESTDIR)$(BINDIR)/tkabber-remote
--	chmod 755 $(DESTDIR)$(BINDIR)/tkabber
--	chmod 755 $(DESTDIR)$(BINDIR)/tkabber-remote
- 
- install-doc: doc
- 	install -d $(DESTDIR)$(DOCDIR)
diff --git a/tkabber-1.1.1-install.patch b/tkabber-1.1.1-install.patch
new file mode 100644
index 0000000..266faa9
--- /dev/null
+++ b/tkabber-1.1.1-install.patch
@@ -0,0 +1,25 @@
+diff -urp tkabber-1.1.1/Makefile tkabber-1.1.1-install/Makefile
+--- tkabber-1.1.1/Makefile	2015-03-17 19:31:32.475296000 +0600
++++ tkabber-1.1.1-install/Makefile	2015-04-01 10:38:09.605020485 +0600
+@@ -1,6 +1,6 @@
+ # $Id: Makefile 2173 2015-03-17 13:31:32Z sergei $
+ 
+-PREFIX = /usr/local
++PREFIX = /usr
+ TKABBERDIR = $(PREFIX)/share/tkabber
+ DOCDIR = $(PREFIX)/share/doc/tkabber
+ BINDIR = $(PREFIX)/bin
+@@ -33,13 +33,6 @@ install-bin:
+ 	cp -dr --no-preserve=ownership *.tcl $(SUBDIRS) $(DESTDIR)$(TKABBERDIR)
+ 	chmod 755 $(DESTDIR)$(TKABBERDIR)/tkabber.tcl
+ 	chmod 755 $(DESTDIR)$(TKABBERDIR)/tkabber-remote.tcl
+-	install -d $(DESTDIR)$(BINDIR)
+-	echo "#!/bin/sh" >$(DESTDIR)$(BINDIR)/tkabber
+-	echo "exec $(TKABBERDIR)/tkabber.tcl \"\$$@\"" >>$(DESTDIR)$(BINDIR)/tkabber
+-	echo "#!/bin/sh" >$(DESTDIR)$(BINDIR)/tkabber-remote
+-	echo "exec $(TKABBERDIR)/tkabber-remote.tcl \"\$$@\"" >>$(DESTDIR)$(BINDIR)/tkabber-remote
+-	chmod 755 $(DESTDIR)$(BINDIR)/tkabber
+-	chmod 755 $(DESTDIR)$(BINDIR)/tkabber-remote
+ 
+ install-doc: doc
+ 	install -d $(DESTDIR)$(DOCDIR)
diff --git a/tkabber.spec b/tkabber.spec
index aac1b56..042f98a 100644
--- a/tkabber.spec
+++ b/tkabber.spec
@@ -2,7 +2,7 @@
 
 Name:           tkabber
 Version:        1.1.1
-Release:        1.%{svnrev}%{?dist}
+Release:        2.%{svnrev}%{?dist}
 Summary:        Client for the Jabber instant messaging system
 
 Group:          Applications/Internet
@@ -17,7 +17,7 @@ Source2:        tkabber.png
 Source3:        tkabber.desktop
 Source4:        tkabber
 Source5:        tkabber-remote
-Patch0:         tkabber-1.0-install.patch
+Patch0:         tkabber-1.1.1-install.patch
 
 BuildArch:      noarch
 
@@ -80,6 +80,9 @@ chmod 755 %{buildroot}%{_bindir}/tkabber-remote
 %{_datadir}/pixmaps/tkabber.png
 
 %changelog
+* Wed Apr 01 2015 Dmitrij S. Kryzhevich <krege at land.ru> - 1.1.1-2.svn2173
+- Fix patch.
+
 * Wed Apr 01 2015 Dmitrij S. Kryzhevich <krege at land.ru> - 1.1.1-1.svn2173
 - Update to new 1.1.1+ svn, revisino 2173.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tkabber.git/commit/?h=f21&id=643a109ab51c3373c79e4a85eac164818608f3aa