diff --git a/.gitignore b/.gitignore index 617876d..497d35b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /tkabber-1.0-svn.tar.bz2 /tkabber-1.1-svn.tar.bz2 /tkabber-1.1.1-svn2173.tar.bz2 +/tkabber-1.1.2.tar.xz diff --git a/sources b/sources index df50c2c..52c80e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af858bc7146a5847ff210e5273a3c84a tkabber-1.1.1-svn2173.tar.bz2 +6d15da2d72bbc76a525f4b72b127fd8e tkabber-1.1.2.tar.xz diff --git a/tkabber-1.1.1-install.patch b/tkabber-1.1.1-install.patch deleted file mode 100644 index 266faa9..0000000 --- a/tkabber-1.1.1-install.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-1.1.2-install.patch b/tkabber-1.1.2-install.patch new file mode 100644 index 0000000..06d7815 --- /dev/null +++ b/tkabber-1.1.2-install.patch @@ -0,0 +1,25 @@ +diff -urp tkabber-1.1.2/Makefile tkabber-1.1.2-install/Makefile +--- tkabber-1.1.2/Makefile 2015-05-11 01:19:50.000000000 +0600 ++++ tkabber-1.1.2-install/Makefile 2015-07-01 17:26:20.455829578 +0600 +@@ -1,6 +1,6 @@ + # Tkabber Makefile + +-PREFIX = /usr/local ++PREFIX = /usr + TKABBERDIR = $(PREFIX)/share/tkabber + DOCDIR = $(PREFIX)/share/doc/tkabber + BINDIR = $(PREFIX)/bin +@@ -32,13 +32,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 851c7a4..59c025b 100644 --- a/tkabber.spec +++ b/tkabber.spec @@ -1,14 +1,14 @@ -%global svnrev svn2173 +#%%global svnrev svn2173 Name: tkabber -Version: 1.1.1 -Release: 3.%{svnrev}%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Client for the Jabber instant messaging system Group: Applications/Internet License: GPLv2+ URL: http://tkabber.jabber.ru/ -Source0: %{name}-%{version}-%{svnrev}.tar.bz2 +Source: %{name}-%{version}.tar.xz # for relase version: #Source0: http://files.jabber.ru/tkabber/%{name}-%{version}.tar.gz # script to get tkabber from svn @@ -17,7 +17,7 @@ Source2: tkabber.png Source3: tkabber.desktop Source4: tkabber Source5: tkabber-remote -Patch0: tkabber-1.1.1-install.patch +Patch0: tkabber-1.1.2-install.patch BuildArch: noarch @@ -80,6 +80,9 @@ chmod 755 %{buildroot}%{_bindir}/tkabber-remote %{_datadir}/pixmaps/tkabber.png %changelog +* Wed Jul 01 2015 Dmitrij S. Kryzhevich - 1.1.2-1 +- Update to 1.1.2. + * Fri Jun 19 2015 Fedora Release Engineering - 1.1.1-3.svn2173 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild