[packages/tailor] new, version 0.9.35
glen
glen at pld-linux.org
Sun Nov 11 21:35:16 CET 2012
commit e828118e1e4876ddcfca66dfb298d38fba3f52b5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Nov 11 22:34:49 2012 +0200
new, version 0.9.35
based on fedora package
mercurial-1.1-compat.patch | 19 ++++++++++
mercurial-1.1.2-delete.patch | 24 ++++++++++++
tailor-test.patch | 14 +++++++
tailor.spec | 89 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 146 insertions(+)
---
diff --git a/tailor.spec b/tailor.spec
new file mode 100644
index 0000000..f73b6a7
--- /dev/null
+++ b/tailor.spec
@@ -0,0 +1,89 @@
+Summary: A tool to migrate changesets between several version control systems
+Name: tailor
+Version: 0.9.35
+Release: 1
+Source0: http://darcs.arstecnica.it/tailor/%{name}-%{version}.tar.gz
+# Source0-md5: 58a6bc1c1d922b0b1e4579c6440448d1
+License: GPL v3+
+Group: Development/Tools
+URL: http://progetti.arstecnica.it/tailor
+Patch0: %{name}-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=477148
+# http://progetti.arstecnica.it/tailor/ticket/172
+Patch1: mercurial-1.1-compat.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=478841
+Patch2: mercurial-1.1.2-delete.patch
+BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.219
+Requires: python-vcpx = %{version}-%{release}
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Tailor is a tool to migrate changesets between Aegis, ArX, Bazaar,
+Bazaar-NG, CVS, Codeville, Darcs, Git, Mercurial, Monotone, Perforce,
+Subversion and Tla repositories.
+
+This script makes it easier to keep the upstream changes merged in a
+branch of a product, storing needed information such as the upstream
+URI and revision in special properties on the branched directory.
+
+%package -n python-vcpx
+Summary: Version Control Patch eXchanger
+Group: Development/Libraries
+Requires: cvs
+Requires: git-core
+Requires: mercurial >= 1.1.2
+Requires: monotone
+Requires: subversion
+
+%description -n python-vcpx
+This is the package `vcpx` (pronounced "veeseepex"). It encapsulates
+the machinery needed to keep the patches in sync across different VC
+systems.
+
+%prep
+%setup -q
+%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+
+# remove the shebang line
+%{__sed} -i -e '1d' vcpx/repository/p4/p4lib.py
+
+%build
+%{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install \
+ --skip-build \
+ --optimize=2 \
+ --root=$RPM_BUILD_ROOT
+
+%py_postclean
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc README.html
+%attr(755,root,root) %{_bindir}/%{name}
+
+%files -n python-vcpx
+%defattr(644,root,root,755)
+%{py_sitescriptdir}/tailor-%{version}-*.egg-info
+%dir %{py_sitescriptdir}/vcpx
+%{py_sitescriptdir}/vcpx/*.py[co]
+%dir %{py_sitescriptdir}/vcpx/repository
+%{py_sitescriptdir}/vcpx/repository/*.py[co]
+%dir %{py_sitescriptdir}/vcpx/repository/aegis
+%{py_sitescriptdir}/vcpx/repository/aegis/*.py[co]
+%dir %{py_sitescriptdir}/vcpx/repository/darcs
+%{py_sitescriptdir}/vcpx/repository/darcs/*.py[co]
+%dir %{py_sitescriptdir}/vcpx/repository/git
+%{py_sitescriptdir}/vcpx/repository/git/*.py[co]
+%dir %{py_sitescriptdir}/vcpx/repository/p4
+%{py_sitescriptdir}/vcpx/repository/p4/*.py[co]
diff --git a/mercurial-1.1-compat.patch b/mercurial-1.1-compat.patch
new file mode 100644
index 0000000..de7b661
--- /dev/null
+++ b/mercurial-1.1-compat.patch
@@ -0,0 +1,19 @@
+diff -rup tailor-0.9.35.old/vcpx/repository/hg.py tailor-0.9.35.new/vcpx/repository/hg.py
+--- tailor-0.9.35.old/vcpx/repository/hg.py 2008-06-02 13:14:41.000000000 +0100
++++ tailor-0.9.35.new/vcpx/repository/hg.py 2008-12-19 11:58:51.000000000 +0000
+@@ -343,9 +343,12 @@ class HgWorkingDir(UpdatableSourceWorkin
+ if cmdutil.findcmd.func_code.co_argcount == 2: # 0.9.4
+ def findcmd(cmd):
+ return cmdutil.findcmd(self._getUI(), cmd)
+- elif cmdutil.findcmd.func_code.co_argcount == 3: # 0.9.5
++ elif cmdutil.findcmd.func_code.co_argcount == 3: # >= 0.9.5
+ def findcmd(cmd):
+- return cmdutil.findcmd(self._getUI(), cmd, commands.table)
++ if cmdutil.findcmd.func_code.co_varnames[0] == "ui": # < 1.1.0
++ return cmdutil.findcmd(self._getUI(), cmd, commands.table)
++ else: # >= 1.1.0
++ return cmdutil.findcmd(cmd, commands.table)
+ elif hasattr(commands, 'findcmd'): # < 0.9.4
+ if commands.findcmd.func_code.co_argcount == 1:
+ findcmd = commands.findcmd
+Only in tailor-0.9.35.new/vcpx/repository: hg.py~
diff --git a/mercurial-1.1.2-delete.patch b/mercurial-1.1.2-delete.patch
new file mode 100644
index 0000000..ab46bf4
--- /dev/null
+++ b/mercurial-1.1.2-delete.patch
@@ -0,0 +1,24 @@
+--- tailor-0.9.35/vcpx/repository/hg.py.hg-1.1.2-delete 2009-01-06 09:14:38.000000000 +0100
++++ tailor-0.9.35/vcpx/repository/hg.py 2009-01-06 09:14:48.000000000 +0100
+@@ -13,7 +13,7 @@ instead of thru the command line.
+
+ __docformat__ = 'reStructuredText'
+
+-from mercurial import ui, hg, cmdutil, commands
++from mercurial import ui, hg, cmdutil, commands, match
+
+ from vcpx.repository import Repository
+ from vcpx.source import UpdatableSourceWorkingDir
+@@ -479,8 +479,11 @@ class HgWorkingDir(UpdatableSourceWorkin
+ """
+ from os.path import join, split
+
++ m = match.exact(self.repository.basedir,
++ self.repository.basedir,
++ [subdir])
+ files = []
+- for src, path in self._getRepo().dirstate.walk([subdir]):
++ for path in self._getRepo().dirstate.walk(m, unknown=True, ignored=False):
+ # If subdir is a plain file, just return
+ if path == subdir:
+ return None
diff --git a/tailor-test.patch b/tailor-test.patch
new file mode 100644
index 0000000..2b9f31b
--- /dev/null
+++ b/tailor-test.patch
@@ -0,0 +1,14 @@
+--- tailor.orig 2007-06-27 21:28:22.000000000 +0200
++++ tailor 2007-06-27 21:31:14.000000000 +0200
+@@ -21,10 +21,7 @@
+
+ locale.setlocale(locale.LC_CTYPE, '')
+ if len(sys.argv)>1 and sys.argv[1] == 'test':
+- from vcpx.tests import main
+- sys.argv[0] += " test"
+- del sys.argv[1]
+- main()
++ print "Running tests is not possible on installed package"
+ else:
+ from vcpx.tailor import main, TailorException
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tailor.git/commitdiff/e828118e1e4876ddcfca66dfb298d38fba3f52b5
More information about the pld-cvs-commit
mailing list