diff --git a/.cvsignore b/.cvsignore index 29ff42c..817f4e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,4 @@ +clog geojasper_src.zip jasper-1.701.0.zip +jasper-1.900.0.zip diff --git a/jasper.spec b/jasper.spec index 237186e..5441f95 100644 --- a/jasper.spec +++ b/jasper.spec @@ -1,8 +1,7 @@ -# NOTE: packages can use jasper: +# NOTE: packages that can use jasper: # ImageMagick # kdelibs -# koffice # netpbm # define to use GeoJasper @@ -11,8 +10,8 @@ Summary: Implementation of the JPEG-2000 standard, Part 1 Name: jasper Group: System Environment/Libraries -Version: 1.701.0 -Release: 15%{?dist}.2 +Version: 1.900.0 +Release: 1%{?dist} License: JasPer License Version 2.0 %if "%{?geo:1}" == "1" @@ -22,7 +21,7 @@ Source: http://dimin.m6.net/software/utils/geojasper_src.zip Provides: geojasper = %{geojasper_ver} %else URL: http://www.ece.uvic.ca/~mdadams/jasper/ -Source: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip +Source0: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -80,10 +79,6 @@ automake -a make %{?_smp_mflags} -%check ||: -make check - - %install rm -rf $RPM_BUILD_ROOT @@ -91,10 +86,22 @@ 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}/lib*.la +%check +make check + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + %files %defattr(-,root,root,-) %doc COPYRIGHT LICENSE NEWS README @@ -102,7 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %{_bindir}/jiv %{_bindir}/imginfo %{_bindir}/*jasper* +%{_bindir}/tmrdemo %{_libdir}/lib*.so.* +%{_mandir}/man1/* %files devel %defattr(-,root,root,-) @@ -111,18 +120,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %{_libdir}/lib*.so -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%clean -rm -rf $RPM_BUILD_ROOT - - %changelog -* Wed Oct 04 2006 Rex Dieter -- respin +* Fri Dec 08 2006 Rex Dieter 1.900.0-1 +- jasper-1.900.0 * Mon Sep 18 2006 Rex Dieter 1.701.0-15 - memory leak (#207006) diff --git a/sources b/sources index b7bc6c6..80fbc58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22a9f74fc880e38dd125c60aa4e4ce97 jasper-1.701.0.zip +bef4a89e72b6a2a68a963c0dc837bacb jasper-1.900.0.zip