[ocamldsort] New upstream version. Drop unnecessary spec file elements (BuildRoot, etc.). Change to ExclusiveArch

Jerry James jjames at fedoraproject.org
Fri Oct 14 21:00:46 UTC 2011


commit ce7d4216804c0fb4692d024966cac7492f97c770
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Oct 14 15:00:15 2011 -0600

    New upstream version.
    Drop unnecessary spec file elements (BuildRoot, etc.).
    Change to ExclusiveArch using new ocaml_arches macro.
    Drop unnecessary BRs.
    Use the %configure macro.
    Let RPM compress the man page however it likes.
    Add COPYING and README to docs.

 .gitignore      |    2 +-
 ocamldsort.spec |   39 +++++++++++++++++----------------------
 sources         |    2 +-
 3 files changed, 19 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 679b2ed..8071db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-ocamldsort-0.14.4.tar.gz
+/ocamldsort-0.15.0.tar.gz
diff --git a/ocamldsort.spec b/ocamldsort.spec
index e4bf76e..0eee0d6 100644
--- a/ocamldsort.spec
+++ b/ocamldsort.spec
@@ -2,20 +2,17 @@
 %define debug_package %{nil}
 
 Name:           ocamldsort
-Version:        0.14.4
-Release:        8%{?dist}
+Version:        0.15.0
+Release:        1%{?dist}
 Summary:        Dependency sorter for OCaml source files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://dimitri.mutu.net/ocaml.html
-Source0:        ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
+Source0:        ftp://quatramaran.ens.fr/pub/ara/%{name}/%{name}-%{version}.tar.gz
+ExclusiveArch:  %{ocaml_arches}
 
 BuildRequires:  ocaml >= 3.10.0
-BuildRequires:  ocaml-findlib-devel
-BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 
 
@@ -35,18 +32,13 @@ should be given as arguments to the ocamldsort command.
 %prep
 %setup -q
 
-# The configure script for this package contains some mistakes
-# but they don't affect building.
-./configure --libdir=%{_libdir}
-
 
 %build
+%configure
 make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -57,22 +49,25 @@ install -m 0755 ocamldsort $RPM_BUILD_ROOT%{_bindir}
 %endif
 strip $RPM_BUILD_ROOT%{_bindir}/ocamldsort
 
-gzip ocamldsort.1
-install -m 0644 ocamldsort.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 0644 ocamldsort.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
 %files
-%defattr(-,root,root,-)
-%doc 
+%doc COPYING README
 %{_bindir}/ocamldsort
-%{_mandir}/man1/ocamldsort.1.gz
+%{_mandir}/man1/ocamldsort.1*
 
 
 %changelog
+* Fri Oct 14 2011 Jerry James <loganjerry at gmail.com> - 0.15.0-1
+- New upstream version
+- Drop unnecessary spec file elements (BuildRoot, etc.)
+- Change to ExclusiveArch using new ocaml_arches macro
+- Drop unnecessary BRs
+- Use the %%configure macro
+- Let RPM compress the man page however it likes
+- Add COPYING and README to docs
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 93a3636..895b223 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9651d6afb204c0b22cd69be8a847e1d4  ocamldsort-0.14.4.tar.gz
+8b7fbdc958c2322f614ef141084df56a  ocamldsort-0.15.0.tar.gz


More information about the scm-commits mailing list