rpms/zeroinstall-injector/EL-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 zeroinstall-injector.spec, 1.4, 1.5 zeroinstall-x86_64-arch.patch, 1.1, NONE

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/zeroinstall-injector/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30838/EL-5

Modified Files:
	.cvsignore sources zeroinstall-injector.spec 
Removed Files:
	zeroinstall-x86_64-arch.patch 
Log Message:
zeroinstall-injector 0.38 for RHEL-5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Nov 2006 00:00:32 -0000	1.3
+++ .cvsignore	1 Mar 2009 21:52:27 -0000	1.4
@@ -1 +1 @@
-zeroinstall-injector-0.24.tar.gz.gpg
+zeroinstall-injector-0.38.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zeroinstall-injector/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Nov 2006 00:00:32 -0000	1.3
+++ sources	1 Mar 2009 21:52:28 -0000	1.4
@@ -1 +1 @@
-d543beb1742374b1d2d983f0d05388fc  zeroinstall-injector-0.24.tar.gz.gpg
+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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zeroinstall-injector.spec	11 Nov 2006 17:46:19 -0000	1.4
+++ zeroinstall-injector.spec	1 Mar 2009 21:52:28 -0000	1.5
@@ -1,63 +1,125 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%define cache_dir /var/cache/0install.net
+
 Name:    zeroinstall-injector
-Version: 0.24
+Version: 0.38
 Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
-License: LGPL
+License: LGPLv2
 URL:     http://0install.net
-Source0: http://osdn.dl.sf.net/sourceforge/zero-install/%{name}-%{version}.tar.gz.gpg
-Patch0:  zeroinstall-x86_64-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 gnupg
-Requires: PyXML pygtk2 gnupg
+BuildRequires: python-devel desktop-file-utils
+Requires:      PyXML pygtk2 gnupg pygtk2-libglade sudo xdg-utils
+Requires(pre): shadow-utils
 
 %description
-A running process is created by combining many different libraries (and other
-components). In the Zero Install world, we have all versions of each library
-available at all times. The problem then is how to choose which versions to
-use.
-
-The injector solves this problem by selecting components to meet a program's
-requirements, according to a policy you give it. The injector finds out which
-versions are available, and downloads and runs the ones you choose.
+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
-gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf -
-%setup -q -T -D
-%patch0 -p1 -b .arch
+%setup -q
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
+mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
+
+for i in add manage; do
+  desktop-file-install \
+%if 0%{!?fedora:1}
+    --vendor="" \
+%endif
+    --remove-category="Application" \
+    --delete-original \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# Add the "zeroinst" user.
+# This is not used by default, but is required if you want to
+# set up sharing of downloads later.
+getent group  zeroinst >/dev/null || groupadd -r zeroinst
+getent passwd zeroinst >/dev/null || \
+useradd -r -g zeroinst -d %{cache_dir} -s /sbin/nologin \
+    -c "Zero Install shared cache" zeroinst
+exit 0
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/0*
-%dir %{python_sitelib}/zeroinstall/
-%dir %{python_sitelib}/zeroinstall/0launch-gui/
-%dir %{python_sitelib}/zeroinstall/injector/
-%dir %{python_sitelib}/zeroinstall/zerostore/
-%{python_sitelib}/zeroinstall/*.py*
-%{python_sitelib}/zeroinstall/0launch-gui/0launch-gui
-%{python_sitelib}/zeroinstall/0launch-gui/README
-%{python_sitelib}/zeroinstall/0launch-gui/ZeroInstall-GUI.xml
-%{python_sitelib}/zeroinstall/*/*.py*
+%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu
+%{_datadir}/applications/*.desktop
+%{_datadir}/desktop-directories/zeroinstall.directory
+%{_datadir}/pixmaps/zeroinstall-zero2desktop.png
+%{python_sitelib}/zeroinstall/
+%if 0%{?fedora} >= 9
+%{python_sitelib}/*.egg-info
+%endif
 %{_mandir}/man1/0*
-
+%dir %{cache_dir}
+%attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* 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
+
+* Fri Feb 27 2009 Michel Salim <salimma at fedoraproject.org> - 0.38-1
+- Update to 0.38
+- Upgrades now preserve the existing menu, if modified
+
+* Sun Aug  3 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.34-1
+- Update to 0.34
+
+* Sat Apr  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.32-1
+- Update to 0.32
+- Package .egg-info file on Fedora >= 9
+
+* Fri Jan 18 2008 Michel Salim <michel.sylvan at gmail.com> - 0.31-1
+- Update to 0.31
+
+* Sat Sep  8 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-2
+- Update scriptlet that creates zeroinst user
+
+* Wed Sep  5 2007 Michel Salim <michel.sylvan at gmail.com> 0.30-1
+- Update to 0.30
+- License is now versioned
+- Incorporate changes from Thomas Leonard:
+  * create zeroinst user
+  * create shared cache
+
+* Mon Dec 18 2006 Michel Salim <michel.salim at gmail.com> 0.24-3
+- Rebuild for development branch
+
 * Sat Nov 11 2006 Michel Salim <michel.salim at gmail.com> 0.24-2
 - Allow installation of ix86 binaries on x86_64
 


--- zeroinstall-x86_64-arch.patch DELETED ---