rpms/jasper/devel jasper.spec,1.25,1.26
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Sep 17 18:16:26 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3788
Modified Files:
jasper.spec
Log Message:
* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
- (main) drop Requires: %name-libs
- -devel: Provides: libjasper-devel
- drop (unused) geojasper bits
Index: jasper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jasper.spec 22 Aug 2007 15:39:20 -0000 1.25
+++ jasper.spec 17 Sep 2007 18:15:53 -0000 1.26
@@ -4,25 +4,15 @@
# kdelibs
# netpbm
-# define to use GeoJasper
-#define geo 1
-
Summary: Implementation of the JPEG-2000 standard, Part 1
Name: jasper
Group: System Environment/Libraries
Version: 1.900.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: JasPer
-%if "%{?geo:1}" == "1"
-%define geojasper_ver 1.2.9
-URL: http://www.dimin.net/software/utils.html
-Source: http://dimin.m6.net/software/utils/geojasper_src.zip
-Provides: geojasper = %{geojasper_ver}
-%else
URL: http://www.ece.uvic.ca/~mdadams/jasper/
Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: jasper-1.701.0-GL.patch
@@ -37,8 +27,6 @@
# "freeglut-devel: Requires: libGL-devel libGLU-devel" (#179464)
BuildRequires: freeglut-devel libGL-devel libGLU-devel
-Requires: %{name}-libs = %{version}-%{release}
-
%description
This package contains an implementation of the image compression
standard JPEG-2000, Part 1. It consists of tools for conversion to and
@@ -47,6 +35,7 @@
%package devel
Summary: JasPer header files, libraries and developer documentation.
Group: Development/Libraries
+Provides: libjasper-devel = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: libjpeg-devel
%description devel
@@ -69,22 +58,11 @@
%prep
-%setup -q -n %{name}-%{version}%{?geo:.GEO}
+%setup -q -n %{name}-%{version}
%patch1 -p1 -b .GL
%patch3 -p1 -b .CVE-2007-2721
-%if "%{?geo:1}" == "1"
-chmod +x configure configure.ac
-%patch2 -p1 -b .GL-ac
-libtoolize --force
-aclocal
-autoconf
-autoheader
-automake -a
-%endif
-
-
%build
@@ -120,7 +98,6 @@
%files
%defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE NEWS README
%{_bindir}/imgcmp
%{_bindir}/imginfo
%{_bindir}/jasper
@@ -135,6 +112,7 @@
%files libs
%defattr(-,root,root,-)
+%doc COPYRIGHT LICENSE NEWS README
%{_libdir}/lib*.so.*
%files utils
@@ -145,6 +123,11 @@
%changelog
+* Mon Sep 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-5
+- (main) drop Requires: %%name-libs
+- -devel: Provides: libjasper-devel
+- drop (unused) geojasper bits
+
* Wed Aug 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.900.1-4
- -libs subpkg to be multilib friendlier
- -utils subpkg for non-essential binaries jiv, tmrdemo (#244153)
More information about the fedora-extras-commits
mailing list