0install: review feedback

1 files changed, 27 insertions, 162 deletions

diff --git a/ocaml/0install.spec b/ocaml/0install.spec
index 8cbb746..fd91598 100644
--- a/ocaml/0install.spec
+++ b/ocaml/0install.spec
@@ -1,24 +1,31 @@
 %global cache_dir /var/cache/0install.net
 
 Name:           0install
-Version:        2.6
+Version:        2.6.1
 Release:        1%{?dist}
 Summary:        A decentralized cross-distribution software installation system
 
-License:        LGPLv2
+License:        LGPLv2+
 URL:            http://0install.net
 Source0:        http://downloads.sf.net/project/zero-install/%{name}/%{version}/%{name}-%{version}.tar.bz2
 # Temporarily disable tests, some failures within mock env
 Patch0:         %{name}-2.6-no-tests.patch
+# multilib: use lib64 instead of lib on 64-bit arches
+Patch1:         %{name}-2.6.1-lib64.patch
+
+ExclusiveArch:  %{ocaml_arches}
 
 BuildRequires:  ocaml >= 3.10.0
-BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-biniou-devel
+BuildRequires:  ocaml-easy-format-devel
+BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-curl-devel
-BuildRequires:  ocaml-dbus-devel
 BuildRequires:  ocaml-extlib-devel
 BuildRequires:  ocaml-lablgtk-devel
 BuildRequires:  ocaml-lwt-devel
+# not packaged yet, optional
+# BuildRequires:  ocaml-obus-devel
 BuildRequires:  ocaml-ounit-devel
 BuildRequires:  ocaml-ssl-devel
 BuildRequires:  ocaml-xmlm-devel
@@ -34,13 +41,13 @@ Requires(pre):  shadow-utils
 Requires:       hicolor-icon-theme
 
 Provides:       zeroinstall-injector = %{version}-%{release}
-Obsoletes:      zeroinstall-injector < %{version}-%{release}
+Obsoletes:      zeroinstall-injector < 2.4-1%{?dist}
 
 %description
-Zero Install is a decentralised cross-distribution software
+Zero Install is a decentralized cross-distribution software
 installation system available under the LGPL. It allows software
 developers to publish programs directly from their own web-sites,
-while supporting features familiar from centralised distribution
+while supporting features familiar from centralized distribution
 repositories such as shared libraries, automatic updates and digital
 signatures. It is intended to complement, rather than replace, the
 operating system's package management. 0install packages never
@@ -60,7 +67,7 @@ of a package in parallel when there are conflicting
 requirements. Installation is always side-effect-free (each package is
 unpacked to its own directory and will not touch shared directories
 such as /usr/bin), making it ideal for use with sandboxing
-technologies and virtualisation.
+technologies and virtualization.
 
 The XML file describing the program's requirements can also be
 included in a source-code repository, allowing full dependency
@@ -74,6 +81,9 @@ distribution, which continue to be used for other software.
 %prep
 %setup -q
 %patch0 -p1 -b .no-tests
+%if "%{_lib}" == "lib64"
+%patch1 -p1 -b .lib64
+%endif
 
 
 %build
@@ -83,7 +93,6 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install_system DESTDIR=$RPM_BUILD_ROOT
-strip $RPM_BUILD_ROOT%{_prefix}/lib/0install.net/*.cmxs
 
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
@@ -119,7 +128,7 @@ fi
 %files -f zero-install.lang
 %doc COPYING README.md
 %{_bindir}/0*
-%{_prefix}/lib/0install.net
+%{_libdir}/0install.net
 %{_datadir}/0install.net
 %{_datadir}/applications/0install.desktop
 %{_datadir}/icons/hicolor/*/apps/zeroinstall.*
@@ -138,160 +147,16 @@ fi
 
 
 %changelog
-* Mon Jan 20 2014 Michel Salim <salimma@fedoraproject.org> - 2.6-1
+* Fri Feb 14 2014 Michel Salim <salimma@fedoraproject.org> - 2.6.1-1
 - Update to 2.6.1
+- Install to proper libdir depending on the actual architecture
+- Fix ExclusiveArch, build requirements and obsoletion
+- Fix license tag
+- Yank old changelog from zero-install
+
+* Mon Jan 20 2014 Michel Salim <salimma@fedoraproject.org> - 2.6-1
+- Update to 2.6
 
 * Mon Jan 20 2014 Michel Salim <salimma@fedoraproject.org> - 2.5.1-1
 - Rename package to 0install
 - Update to 2.5.1
-
-* Wed Aug 14 2013 Michel Salim <salimma@fedoraproject.org> - 2.3.3-1
-- Update to 2.3.3
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jul  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.3-1
-- Update to 2.3
-
-* Mon May  6 2013 Michel Salim <salimma@fedoraproject.org> - 2.2-1
-- Update to 2.2
-
-* Fri Apr  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.1-1
-- Update to 2.1
-
-* Wed Mar  6 2013 Michel Salim <salimma@fedoraproject.org> - 2.0-1
-- Update to 2.0
-
-* Mon Feb 25 2013 Michel Salim <salimma@fedoraproject.org> - 1.16-1
-- Update to 1.16
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Nov 19 2012 Michel Salim <salimma@fedoraproject.org> - 1.13-1
-- Update to 1.13
-
-* Wed Sep  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.11-1
-- Update to 1.11
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 29 2012 Michel Salim <salimma@fedoraproject.org> - 1.9-1
-- Update to 1.9
-- Remove redundant %%{python_sitelib} declaration
-
-* Wed May 23 2012 Michel Salim <salimma@fedoraproject.org> - 1.8-1
-- Update to 1.8
-
-* Tue Apr 24 2012 Michel Salim <salimma@fedoraproject.org> - 1.7-1
-- Update to 1.7
-
-* Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-2
-- Prune dependencies
-
-* Thu Jan 26 2012 Michel Salim <salimma@fedoraproject.org> - 1.5-1
-- Update to 1.5
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Jul 25 2011 Michel Salim <salimma@fedoraproject.org> - 1.2-1
-- Update to 1.2
-
-* Sat Jul  2 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-2
-- Further launcher script clean-up
-
-* Wed Jun 29 2011 Michel Salim <salimma@fedoraproject.org> - 1.1-1
-- Update to 1.1
-- Remove --versions option, obsoleted in favor of '0alias launcher'
-
-* Wed Jun 22 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-3
-- Fix --versions handling of 0alias-generated launchers
-
-* Wed Jun 15 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-2
-- Add main category "System" to desktop entries
-
-* Tue Jun 14 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-1
-- Update to 1.0
-
-* Tue May  3 2011 Michel Salim <salimma@fedoraproject.org> - 1.0-0.rc1.1
-- Update to 1.0rc1
-
-* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 0.53-1
-- Update to 0.53
-
-* Sun Mar 13 2011 Michel Salim <salimma@fedoraproject.org> - 0.52-1
-- Update to 0.52
-
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.49-3
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Fri Jul  9 2010 Michel Salim <salimma@fedoraproject.org> - 0.49-2
-- Enable tests
-
-* Fri Jul  9 2010 Michel Salim <salimma@fedoraproject.org> - 0.49-1
-- Update to 0.49
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.38-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat Feb 28 2009 Michel Salim <salimma@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@fedoraproject.org> - 0.38-1
-- Update to 0.38
-- Upgrades now preserve the existing menu, if modified
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@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@gmail.com> - 0.34-2
-- Rebuild for Python 2.6
-
-* Sun Aug  3 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.34-1
-- Update to 0.34
-
-* Sat Apr  5 2008 Michel Salim <salimma@fedoraproject.org> - 0.32-1
-- Update to 0.32
-- Package .egg-info file on Fedora >= 9
-
-* Fri Jan 18 2008 Michel Salim <michel.sylvan@gmail.com> - 0.31-1
-- Update to 0.31
-
-* Sat Sep  8 2007 Michel Salim <michel.sylvan@gmail.com> 0.30-2
-- Update scriptlet that creates zeroinst user
-
-* Wed Sep  5 2007 Michel Salim <michel.sylvan@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@gmail.com> 0.24-3
-- Rebuild for development branch
-
-* Sat Nov 11 2006 Michel Salim <michel.salim@gmail.com> 0.24-2
-- Allow installation of ix86 binaries on x86_64
-
-* Sat Nov  4 2006 Michel Salim <michel.salim@gmail.com> 0.24-1
-- Update to 0.24
-- Not ghosting .pyos any longer
-
-* Sun Oct  8 2006 Michel Salim <michel.salim@gmail.com> 0.23-1
-- Update to 0.23
-
-* Sun Mar  5 2006 Michel Salim <michel.salim@gmail.com> 0.18-4
-- Removed left-behind pushd and popd
-
-* Sat Feb 25 2006 Michel Salim <michel.salim@gmail.com> 0.18-3
-- Add Python-related requirements, BuildReq on gnupg to decrypt upstream source
-
-* Sat Feb 18 2006 Michel Salim <michel.salim@gmail.com> 0.18-2
-- Use _mandir, discard CFLAGS and unused python_sitearch definition
-
-* Thu Feb 16 2006 Michel Salim <michel.salim@gmail.com> 0.18-1
-- Initial Fedora Extras release, based on upstream spec contributed by Juan Carlos Jimenez Garcia