rpms/zeroinstall-injector/F-12 zeroinstall-injector-0.49-any-arch.patch, NONE, 1.1 zeroinstall-injector.spec, 1.19, 1.20
Michel Alexandre Salim
salimma at fedoraproject.org
Fri Jul 9 15:23:04 UTC 2010
Author: salimma
Update of /cvs/pkgs/rpms/zeroinstall-injector/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30031/F-12
Modified Files:
zeroinstall-injector.spec
Added Files:
zeroinstall-injector-0.49-any-arch.patch
Log Message:
* Fri Jul 9 2010 Michel Salim <salimma at fedoraproject.org> - 0.49-2
- Enable tests
zeroinstall-injector-0.49-any-arch.patch:
testdistro.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE zeroinstall-injector-0.49-any-arch.patch ---
--- zeroinstall-injector-0.49/tests/testdistro.py.any-arch 2010-07-03 15:38:46.000000000 +0200
+++ zeroinstall-injector-0.49/tests/testdistro.py 2010-07-09 16:42:36.777158793 +0200
@@ -207,9 +207,11 @@
factory = self.make_factory(ports)
ports.get_package_info('zeroinstall-injector', factory)
self.assertEquals(1, len(self.feed.implementations))
- impl = self.feed.implementations['package:ports:zeroinstall-injector:0.41-2:x86_64']
+ import platform
+ machine = platform.machine()
+ impl = self.feed.implementations['package:ports:zeroinstall-injector:0.41-2:'+machine]
self.assertEquals('0.41-2', impl.get_version())
- self.assertEquals('x86_64', impl.machine)
+ self.assertEquals(machine, impl.machine)
def testCleanVersion(self):
self.assertEquals('0.3.1-1', distro.try_cleanup_distro_version('1:0.3.1-1'))
Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/F-12/zeroinstall-injector.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- zeroinstall-injector.spec 9 Jul 2010 11:06:27 -0000 1.19
+++ zeroinstall-injector.spec 9 Jul 2010 15:23:04 -0000 1.20
@@ -4,20 +4,29 @@
Name: zeroinstall-injector
Version: 0.49
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Zero Install Injector (0launch)
Group: Applications/System
License: LGPLv2
URL: http://0install.net
Source0: http://downloads.sourceforge.net/zero-install/%{name}-%{version}.tar.bz2
+# https://sourceforge.net/tracker/?group_id=76468&atid=547191
+Patch0: %{name}-0.49-any-arch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
-Requires: PyXML pygtk2 gnupg sudo xdg-utils tar gzip
+# for-tests
+BuildRequires: PyXML pygtk2 gnupg xdg-utils
+BuildRequires: tar gzip bzip2 xz-lzma-compat
+# /for-tests
+Requires: PyXML pygtk2 gnupg sudo xdg-utils
+Requires: tar gzip bzip2 xz-lzma-compat
+# for PackageKit support
+Requires: dbus-python
Requires(pre): shadow-utils
%description
@@ -41,6 +50,7 @@ automatically check for updates when sof
%prep
%setup -q
+%patch0 -p1 -b .any-arch
%build
%{__python} setup.py build
@@ -63,9 +73,17 @@ for i in add manage; do
done
%find_lang zero-install
+%check
+cd tests
+for t in download packagekit; do
+ mv test${t}.py{,.off}
+done
+./testall.py
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%pre
# Add the "zeroinst" user.
# This is not used by default, but is required if you want to
@@ -93,6 +111,9 @@ exit 0
%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
%changelog
+* Fri Jul 9 2010 Michel Salim <salimma at fedoraproject.org> - 0.49-2
+- Enable tests
+
* Fri Jul 9 2010 Michel Salim <salimma at fedoraproject.org> - 0.49-1
- Update to 0.49
More information about the scm-commits
mailing list