[tkabber-plugins] Update to 1.0+ release

Dmitrij S. Kryzhevich krege at fedoraproject.org
Tue Jan 28 04:02:22 UTC 2014


commit 4bc7021547edd52851b3f03796698e6b7eb8e37d
Author: Dmitrij S. Kryzhevich <krege at land.ru>
Date:   Tue Jan 28 11:02:32 2014 +0700

    Update to 1.0+ release

 .gitignore                           |    1 +
 sources                              |    2 +-
 tkabber-plugins-0.11.1-install.patch |   25 -------------------------
 tkabber-plugins-1.0-install.patch    |   25 +++++++++++++++++++++++++
 tkabber-plugins-snapshot.sh          |    6 +++---
 tkabber-plugins.spec                 |   16 ++++++++--------
 6 files changed, 38 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5848c0..5d07a62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tkabber-plugins-0.11.1.tar.bz2
+/tkabber-plugins-1.0-svn.tar.bz2
diff --git a/sources b/sources
index a50dc71..394e08d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dbed6a2b94225e7acb4c10bbd318eed2  tkabber-plugins-0.11.1.tar.bz2
+fac8cd7694cbf9c1467e6d46265a2c10  tkabber-plugins-1.0-svn.tar.bz2
diff --git a/tkabber-plugins-1.0-install.patch b/tkabber-plugins-1.0-install.patch
new file mode 100644
index 0000000..3a72b20
--- /dev/null
+++ b/tkabber-plugins-1.0-install.patch
@@ -0,0 +1,25 @@
+diff -urp tkabber-plugins-1.0/Makefile tkabber-plugins-1.0-install/Makefile
+--- tkabber-plugins-1.0/Makefile	2014-01-01 00:37:05.280859000 +0700
++++ tkabber-plugins-1.0-install/Makefile	2014-01-28 10:59:08.666105403 +0700
+@@ -1,6 +1,6 @@
+ # $Id: Makefile 2047 2013-12-31 17:37:05Z sergei $
+ 
+-PREFIX = /usr/local
++PREFIX = /usr
+ TKABBERPLUGINSDIR = $(PREFIX)/share/tkabber-plugins
+ DOCDIR = $(PREFIX)/share/doc/tkabber-plugins
+ 
+@@ -47,13 +47,6 @@ install: install-bin install-doc
+ install-bin:
+ 	install -d $(DESTDIR)/$(TKABBERPLUGINSDIR)
+ 	cp -dr --no-preserve=ownership $(SUBDIRS) $(DESTDIR)/$(TKABBERPLUGINSDIR)
+-	@echo ""
+-	@echo ""
+-	@echo ""
+-	@echo "To enable desired plugins copy or link their directories to ~/.tkabber/plugins/"
+-	@echo ""
+-	@echo ""
+-	@echo ""
+ 
+ install-doc:
+ 	install -d $(DESTDIR)/$(DOCDIR)
diff --git a/tkabber-plugins-snapshot.sh b/tkabber-plugins-snapshot.sh
index f7fab9e..055b6fd 100755
--- a/tkabber-plugins-snapshot.sh
+++ b/tkabber-plugins-snapshot.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-version=0.11.1
-svnrev=1948
+version=1.0
+svnrev=2114
 
 svn export -r $svnrev http://svn.xmpp.ru/repos/tkabber/trunk/tkabber-plugins tkabber-plugins-${version}
 
-tar cjf tkabber-plugins-${version}.tar.bz2 tkabber-plugins-${version}
+tar cjf tkabber-plugins-${version}-svn.tar.bz2 tkabber-plugins-${version}
diff --git a/tkabber-plugins.spec b/tkabber-plugins.spec
index d0c6aed..2696fdd 100644
--- a/tkabber-plugins.spec
+++ b/tkabber-plugins.spec
@@ -1,22 +1,21 @@
-%define svnrev svn1948
+%define svnrev svn2114
 
 Name:           tkabber-plugins
-Version:        0.11.1
-Release:        8.%{svnrev}%{?dist}
+Version:        1.0
+Release:        1.%{svnrev}%{?dist}
 Summary:        Additional plugins for tkabber
 
 Group:          Applications/Internet
 # most have BSD, some GPL and tkabber-khim is under TCL
 License:        GPLv2 and BSD and TCL
 URL:            http://tkabber.jabber.ru/
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}-svn.tar.bz2
 # for relase version:
 #Source0:        http://files.jabber.ru/tkabber/%{name}-%{version}.tar.gz
 # script to get tkabber from svn
 Source1:        tkabber-plugins-snapshot.sh
 # modify installation system for Fedora
-Patch:          tkabber-plugins-0.11.1-install.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch:          tkabber-plugins-1.0-install.patch
 
 BuildArch:      noarch
 
@@ -36,8 +35,6 @@ Requires:       tkabber = %{version}
 # empty here
 
 %install
-rm -rf %{buildroot}
-
 make install-bin DESTDIR=%{buildroot}
 
 cp attline/license.terms license.BSD
@@ -52,6 +49,9 @@ rm -rf %{buildroot}
 %{_datadir}/tkabber-plugins
 
 %changelog
+* Tue Jan 28 2014 Dmitrij S. Kryzhevich <krege at land.ru> - 1.0-1.svn2114
+- Update to 1.0+ svn, revision 2114.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-8.svn1948
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list