rpms/zeroinstall-injector/EL-5 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 zeroinstall-injector.spec, 1.9, 1.10 zeroinstall-injector-0.49-any-arch.patch, 1.1, NONE
Michel Alexandre Salim
salimma at fedoraproject.org
Fri Jul 9 16:46:05 UTC 2010
Author: salimma
Update of /cvs/pkgs/rpms/zeroinstall-injector/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8181/EL-5
Modified Files:
.cvsignore sources zeroinstall-injector.spec
Removed Files:
zeroinstall-injector-0.49-any-arch.patch
Log Message:
Revert EL-5 branch to 0.38-2 -- newer versions use Python 2.5 features
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 9 Jul 2010 10:32:17 -0000 1.5
+++ .cvsignore 9 Jul 2010 16:46:05 -0000 1.6
@@ -1 +1 @@
-zeroinstall-injector-0.49.tar.bz2
+zeroinstall-injector-0.38.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 9 Jul 2010 10:32:17 -0000 1.5
+++ sources 9 Jul 2010 16:46:05 -0000 1.6
@@ -1 +1 @@
-64a356e2fab8ca267240b7e44a73c51f zeroinstall-injector-0.49.tar.bz2
+e341afd77ac603a2306baf2b8513f195 zeroinstall-injector-0.38.tar.bz2
Index: zeroinstall-injector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/zeroinstall-injector.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- zeroinstall-injector.spec 9 Jul 2010 15:47:14 -0000 1.9
+++ zeroinstall-injector.spec 9 Jul 2010 16:46:05 -0000 1.10
@@ -3,54 +3,41 @@
%define cache_dir /var/cache/0install.net
Name: zeroinstall-injector
-Version: 0.49
+Version: 0.38
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
+Source0: http://dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-# 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
+BuildRequires: python-devel desktop-file-utils
+Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo xdg-utils
Requires(pre): shadow-utils
%description
-The Zero Install Injector makes it easy for users to install software
-without needing root privileges. It takes the URL of a program and
-runs it (downloading it first if necessary). Any dependencies of the
-program are fetched in the same way. The user controls which version
-of the program and its dependencies to use.
-
-Zero Install is a decentralized installation system (there is no
-central repository; all packages are identified by URLs),
-loosely-coupled (if different programs require different versions of a
-library then both versions are installed in parallel, without
-conflicts), and has an emphasis on security (all package descriptions
-are GPG-signed, and contain cryptographic hashes of the contents of
-each version). Each version of each program is stored in its own
-sub-directory within the Zero Install cache (nothing is installed to
-directories outside of the cache, such as /usr/bin) and no code from
-the package is run during install or uninstall. The system can
-automatically check for updates when software is run.
+The Zero Install Injector makes it easy for users to install software without
+needing root privileges. It takes the URL of a program and runs it
+(downloading it first if necessary). Any dependencies of the program are
+fetched in the same way. The user controls which version of the program and
+its dependencies to use.
+
+Zero Install is a decentralised installation system (there is no central
+repository; all packages are identified by URLs), loosly-coupled (if different
+programs require different versions of a library then both versions are
+installed in parallel, without conflicts), and has an emphasis on security
+(all package descriptions are GPG-signed, and contain cryptographic hashes of
+the contents of each version). Each version of each program is stored in its
+own sub-directory within the Zero Install cache (nothing is installed to
+directories outside of the cache, such as /usr/bin) and no code from the
+package is run during install or uninstall. The system can automatically check
+for updates when software is run.
%prep
%setup -q
-%patch0 -p1 -b .any-arch
%build
%{__python} setup.py build
@@ -71,19 +58,10 @@ for i in add manage; do
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop
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
@@ -94,7 +72,7 @@ useradd -r -g zeroinst -d %{cache_dir} -
-c "Zero Install shared cache" zeroinst
exit 0
-%files -f zero-install.lang
+%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/0*
@@ -103,7 +81,7 @@ exit 0
%{_datadir}/desktop-directories/zeroinstall.directory
%{_datadir}/pixmaps/zeroinstall-zero2desktop.png
%{python_sitelib}/zeroinstall/
-%if 0%{!?el5:1}
+%if 0%{?fedora} >= 9
%{python_sitelib}/*.egg-info
%endif
%{_mandir}/man1/0*
@@ -111,15 +89,6 @@ 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
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.38-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
* Sat Feb 28 2009 Michel Salim <salimma at fedoraproject.org> - 0.38-2
- Workaround for RHEL's desktop-file-utils
- Add missing dependency on xdg-utils
@@ -128,12 +97,6 @@ exit 0
- Update to 0.38
- Upgrades now preserve the existing menu, if modified
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.34-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.34-2
-- Rebuild for Python 2.6
-
* Sun Aug 3 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.34-1
- Update to 0.34
--- zeroinstall-injector-0.49-any-arch.patch DELETED ---
More information about the scm-commits
mailing list