[muParser] Update to latest upstream.

Eric Smith brouhaha at fedoraproject.org
Sat Mar 10 04:19:33 UTC 2012


commit 84aad2fc7d30235be7570cccafe6c3ce71eb02a6
Author: Eric Smith <eric at brouhaha.com>
Date:   Fri Mar 9 20:20:12 2012 -0800

    Update to latest upstream.

 .gitignore                |    1 +
 muParser-1.28-gcc43.patch |   22 ---------------
 muParser-244309.patch     |   63 ---------------------------------------------
 muParser.spec             |   45 ++++++++++++++++++-------------
 sources                   |    2 +-
 5 files changed, 28 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1df38f9..12f29a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 muparser_v128.tar.gz
 /muparser_v134.tar.gz
+/muparser_v2_2_2.zip
diff --git a/muParser.spec b/muParser.spec
index 6b2728c..9b10851 100644
--- a/muParser.spec
+++ b/muParser.spec
@@ -1,13 +1,18 @@
-Name:		muParser
-Summary:	A fast math parser library
-Version:	1.34
-Release:	3%{?dist}
-BuildRequires:	dos2unix
-URL:		http://muparser.sourceforge.net
-License:	MIT
-Group:		Development/Libraries
-Source:		http://puzzle.dl.sourceforge.net/sourceforge/muparser/muparser_v134.tar.gz
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global major 2
+%global minor 2
+%global patch 2
+%global lcname muparser
+%global version_suffix _v%{major}_%{minor}_%{patch}
+
+Name:           muParser
+Summary:        A fast math parser library
+Version:        %{major}.%{minor}.%{patch}
+Release:        1%{?dist}
+BuildRequires:  dos2unix
+URL:            http://muparser.sourceforge.net
+License:        MIT
+Group:          Development/Libraries
+Source:         http://downloads.sourceforge.net/%{lcname}/%{lcname}%{version_suffix}.zip
 
 %package devel
 Summary:        Development and doc files for {%name}
@@ -25,7 +30,7 @@ and precalculating constant parts of it.
 Development files and the documentation
 
 %prep
-%setup -q -n muparser_v134
+%setup -q -n %{lcname}%{version_suffix}
 
 %build
 %configure --enable-shared=yes --enable-debug=no --enable-samples=no
@@ -35,30 +40,32 @@ dos2unix *.txt html/{script,sources,misc}/*
 chmod ugo-x html/{images,sources,misc}/*
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make libdir=$RPM_BUILD_ROOT%{_libdir} prefix=$RPM_BUILD_ROOT/usr install
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %doc Changes.txt
-%doc Credits.txt
 %doc License.txt
-%{_libdir}/libmuparser.so.0
-%{_libdir}/libmuparser.so.0.0.0
+%{_libdir}/lib%{lcname}.so.%{major}
+%{_libdir}/lib%{lcname}.so.%{major}.%{minor}.%{patch}
 
 %files devel
 %{_includedir}/*
 %doc html
-%{_libdir}/libmuparser.so
+%{_libdir}/lib%{lcname}.so
 %{_libdir}/pkgconfig/muparser.pc
 
 %changelog
+* Fri Mar 09 2012 Eric Smith <eric at brouhaha.com> - 2.2.2-1
+- Update to 2.2.2
+- Upstream source distribution is now a .zip file
+- Upstream version number policy is now that the release version matches
+  the .so versioning
+- Clean up spec to modern standards (no clean section or BuildRoot tag, etc.)
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.34-3
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 2e4fd92..295c27e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c4f4bf86aa2a5a737adc0e08cb77737  muparser_v134.tar.gz
+6d77b5cb8096fe2c50afe36ad41bc14a  muparser_v2_2_2.zip


More information about the scm-commits mailing list