rpms/trac-monotone-plugin/EL-6 import.log, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 trac-monotone-plugin.spec, 1.7, 1.8

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/trac-monotone-plugin/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30474/EL-6

Modified Files:
	.cvsignore sources trac-monotone-plugin.spec 
Added Files:
	import.log 
Log Message:
Update to current head, in order to support monotone >= 0.46.


--- NEW FILE import.log ---
trac-monotone-plugin-0_0_14-5_20100327mtnda420c80_fc13:EL-6:trac-monotone-plugin-0.0.14-5.20100327mtnda420c80.fc13.src.rpm:1279972238


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/trac-monotone-plugin/EL-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	8 Feb 2008 21:27:50 -0000	1.5
+++ .cvsignore	24 Jul 2010 11:51:25 -0000	1.6
@@ -1 +1 @@
-TracMonotone-0.0.14.20080208mtnb4dd178b.tar.bz2
+TracMonotone-0.0.14.20100327mtnda420c80.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-monotone-plugin/EL-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Feb 2008 21:27:50 -0000	1.5
+++ sources	24 Jul 2010 11:51:26 -0000	1.6
@@ -1 +1 @@
-757aa349dad7c1c0f5b81e2402bb07d6  TracMonotone-0.0.14.20080208mtnb4dd178b.tar.bz2
+4e09d760d61c41580c33825c4aa5d7fc  TracMonotone-0.0.14.20100327mtnda420c80.tar.bz2


Index: trac-monotone-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-monotone-plugin/EL-6/trac-monotone-plugin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- trac-monotone-plugin.spec	27 Jul 2009 06:11:37 -0000	1.7
+++ trac-monotone-plugin.spec	24 Jul 2010 11:51:26 -0000	1.8
@@ -1,40 +1,31 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define tarname	TracMonotone-%{version}
-%define tardate	20080208
-%define tarrev	b4dd178b
-%define tarsfx	.%{tardate}mtn%{tarrev}
+%global tarname	TracMonotone-%{version}
+%global tardate	20100327
+%global tarrev	da420c80
+%global tarsfx	.%{tardate}mtn%{tarrev}
 
 Name:		trac-monotone-plugin
 Version:	0.0.14
-Release:	4%{tarsfx}%{?dist}
+Release:	5%{tarsfx}%{?dist}
 Summary:	Monotone version control plugin for Trac
-
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://tracmtn.1erlei.de/
 # Source comes from mtn right now:
-#  mtn clone -b net.venge.monotone.trac-plugin -r %{tarrev} monotone.ca tracmtn
+#  mtn clone -r %{tarrev} monotone.ca net.venge.monotone.trac-plugin tracmtn
 #  cd tracmtn; python setup.py sdist --formats bztar
 #  mv dist/%{tarname}.tar.bz2 %{tarname}%{tarsfx}.tar.bz2
 Source:		%{tarname}%{tarsfx}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
-
+BuildRequires:	python-setuptools
 BuildArch:	noarch
 BuildRequires:	python-devel
 Requires:	python-setuptools
-
 Requires:	trac
-Requires:	monotone >= 0.31
+Requires:	monotone >= 0.46
+
 
 %description
 This Trac plugin provides support for the Monotone SCM.
@@ -49,12 +40,12 @@ This Trac plugin provides support for th
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -65,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 11 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.0.14-5.20100327mtnda420c80
+- Update to current head, in order to support monotone >= 0.46.
+- Remove old conditionals.
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.14-4.20080208mtnb4dd178b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild