orion pushed to irrlicht (epel7). "cleanup spec, fix versioning snafu"

[notifications at fedoraproject.org]

>From a1fd85f164401e3b5d3dd3f7766fff68d4fb041c Mon Sep 17 00:00:00 2001
From: "Tom \"spot\" Callaway" <tcallawa at redhat.com>
Date: Wed, 3 Aug 2011 15:15:41 -0400
Subject: cleanup spec, fix versioning snafu


diff --git a/irrlicht.spec b/irrlicht.spec
index 60eaa3c..f9bc673 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,12 +1,13 @@
 %global irrxml_version 1.2
+%global irrlicht_version 1.7.2
 
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
-Version:	1.7.2
-Release:	7%{?dist}
+Version:	%{irrlicht_version}
+Release:	8%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
-Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
+Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{irrlicht_version}.zip
 # Various fixes, optflags, system libraries/headers
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
 Patch0:		irrlicht-1.7.1-optflags.patch
@@ -18,9 +19,7 @@ Patch2:		irrlicht-1.7.1-libaesgm.patch
 Patch3:		irrlicht-1.7.2-fastatof-improvements-typefixes.patch
 # Make libIrrXML.so
 Patch4:		irrlicht-1.7.2-irrXML-shared-library.patch
-
 URL:		http://irrlicht.sourceforge.net/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
 BuildRequires:	libjpeg-devel, zlib-devel, libaesgm-devel
 BuildRequires:	libpng-devel, bzip2-devel
@@ -34,10 +33,10 @@ commercial 3d engines.
 
 %package devel
 Summary:	Development headers and libraries for irrlicht
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{irrlicht_version}-%{release}
 Requires:	mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
 Requires:	libjpeg-devel, zlib-devel, libpng-devel
-Requires:	irrXML-devel = %{irrxml_version}
+Requires:	irrXML-devel%{?_isa} = %{irrxml_version}
 Group:		Development/Libraries
 
 %description devel
@@ -54,7 +53,7 @@ irrXML is a simple and fast open source xml parser for C++.
 %package -n irrXML-devel
 Summary:	Development headers and libraries for irrXML
 Version:	%{irrxml_version}
-Requires:	irrXML = %{irrxml_version}-%{release}
+Requires:	irrXML%{?_isa} = %{irrxml_version}-%{release}
 Group:		Development/Libraries
 
 %description -n irrXML-devel
@@ -85,16 +84,12 @@ cd source/Irrlicht
 make %{?_smp_mflags} sharedlib
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_includedir}/%{name}
 make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install 
 cp -a include/*.h %{buildroot}%{_includedir}/%{name}/
 cd %{buildroot}%{_libdir}
-ln -s libIrrlicht.so.%{version} libIrrlicht.so.1.7
-
-%clean
-rm -rf %{buildroot}
+ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1.7
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -103,13 +98,11 @@ rm -rf %{buildroot}
 %postun -n irrXML -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc readme.txt
 %{_libdir}/libIrrlicht*.so.*
 %{_libdir}/libIrrXML*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/upgrade-guide.txt
 %{_includedir}/%{name}/
 %exclude %{_includedir}/%{name}/fast_atof.h
@@ -122,12 +115,10 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrXML*.so
 
 %files -n irrXML
-%defattr(-,root,root,-)
 %doc readme.txt
 %{_libdir}/libIrrXML*.so.*
 
 %files -n irrXML-devel
-%defattr(-,root,root,-)
 %dir %{_includedir}/%{name}/
 %{_includedir}/%{name}/fast_atof.h
 %{_includedir}/%{name}/heapsort.h
@@ -138,6 +129,10 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrXML*.so
 
 %changelog
+* Wed Aug  3 2011 Tom Callaway <spot at fedoraproject.org> - 1.7.2-8
+- cleanup spec
+- use correct version when performing symlink
+
 * Tue Mar 22 2011 Tom Callaway <spot at fedoraproject.org> - 1.7.2-7
 - fix soname version in link (bz699767)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/irrlicht.git/commit/?h=epel7&id=a1fd85f164401e3b5d3dd3f7766fff68d4fb041c