From 9c08482aa7d4995a305646ca79207a84e494a2c3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mon, 17 Oct 2005 16:04:07 +0000
Subject: [PATCH] - use %{?dist} - BR: Mesa-GL

---
 jasper.spec | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/jasper.spec b/jasper.spec
index 9a8138e..27450fc 100644
--- a/jasper.spec
+++ b/jasper.spec
@@ -8,17 +8,20 @@
 
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
-License: JasPer License Version 2.0
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 4%{?dist_tag}
+Release: 5%{?dist}
 
+License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: libjpeg-devel
+BuildRequires: XFree86-devel
+%define x_pkg %{expand:%%(basename `rpm -q --qf "%%{NAME}" --whatprovides XFree86-devel` -devel)}
+BuildRequires: %{x_pkg}-Mesa-libGL
 BuildRequires: freeglut-devel
+BuildRequires: libjpeg-devel
 
 %description
 This package contains an implementation of the image compression
@@ -28,11 +31,10 @@ from the JP2 and JPC formats.
 %package devel
 Summary: JPEG-2000 library developer files
 Group:   Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: libjpeg-devel
-
 %description devel
-JPEG-2000 library developer files.
+%{summary}.
 
 
 %prep
@@ -41,26 +43,23 @@ JPEG-2000 library developer files.
 
 %build
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --disable-dependency-tracking \
-  --enable-shared --disable-static
+  --disable-static 
 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Unpackaged files
 rm -f doc/README
 rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}*
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-pushd $RPM_BUILD_ROOT%{_bindir}
-mv jasper jaspertool
-popd
+mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
@@ -73,11 +72,11 @@ popd
 %defattr(-,root,root)
 %doc doc/*
 %{_includedir}/*
-#{_libdir}/lib*.la
 %{_libdir}/lib*.so
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
@@ -86,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-5
+- use %%{?dist}
+- BR: Mesa-GL
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt