[packages/urt] - updated to use X11 in /usr - separated libs - verbose bin, lib, man files - release 9
qboosh
qboosh at pld-linux.org
Wed Jan 15 21:11:18 CET 2014
commit 037b68fcf3378be5345cf750f34dae0bd1800028
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jan 15 21:12:17 2014 +0100
- updated to use X11 in /usr
- separated libs
- verbose bin, lib, man files
- release 9
urt-config.patch | 9 ---
urt.spec | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 197 insertions(+), 21 deletions(-)
---
diff --git a/urt.spec b/urt.spec
index b53ee35..dcc1a73 100644
--- a/urt.spec
+++ b/urt.spec
@@ -2,7 +2,7 @@ Summary: Utah Raster Toolkit
Summary(pl.UTF-8): Zestaw narzędzi z Utah do grafiki rastrowej
Name: urt
Version: 3.1b
-Release: 8
+Release: 9
License: GPL-like/"reserved" (see documentation for details)
Group: Applications/Graphics
Source0: ftp://ftp.iastate.edu/pub/utah-raster/%{name}-%{version}.tar.Z
@@ -18,6 +18,7 @@ BuildRequires: libtool >= 2:1.4d
BuildRequires: netpbm-devel >= 10
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
+Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -43,11 +44,23 @@ dostarcza:
zapisanymi w formacie RLE.
- Zestaw programów do manipulowania i wyświetlania obrazków RLE.
+%package libs
+Summary: Utah Raster Toolkit shared library
+Summary(pl.UTF-8): Biblioteka współdzielona Utah Raster Toolkit
+Group: Libraries
+Conflicts: urt < 3.1b-9
+
+%description libs
+Utah Raster Toolkit shared library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona Utah Raster Toolkit.
+
%package devel
Summary: Development files for Utah Raster Toolkit
Summary(pl.UTF-8): Pakiet dla programistów Utah Raster Toolkit
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
%description devel
Utah Raster Toolkit header files.
@@ -91,7 +104,6 @@ sed -e's,^##defpath MAN_DEST.*,#defpath MAN_DEST %{_mandir},' \
%{__make} \
CC="%{__cc}" \
ExtraCFLAGS="%{rpmcflags}" \
- LIBX11="-L/usr/X11R6/%{_lib} -lX11" \
LIBPBMPLUS="-lnetpbm"
%install
@@ -105,23 +117,196 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/rle} \
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/aliastorle
+%attr(755,root,root) %{_bindir}/applymap
+%attr(755,root,root) %{_bindir}/avg4
+%attr(755,root,root) %{_bindir}/crop
+%attr(755,root,root) %{_bindir}/cubitorle
+%attr(755,root,root) %{_bindir}/fant
+%attr(755,root,root) %{_bindir}/geticr
+%attr(755,root,root) %{_bindir}/getx11
+%attr(755,root,root) %{_bindir}/giftorle
+%attr(755,root,root) %{_bindir}/graytorle
+%attr(755,root,root) %{_bindir}/into
+%attr(755,root,root) %{_bindir}/mcut
+%attr(755,root,root) %{_bindir}/mergechan
+%attr(755,root,root) %{_bindir}/painttorle
+%attr(755,root,root) %{_bindir}/pgmtorle
+%attr(755,root,root) %{_bindir}/ppmtorle
+%attr(755,root,root) %{_bindir}/pyrmask
+%attr(755,root,root) %{_bindir}/rawtorle
+%attr(755,root,root) %{_bindir}/repos
+%attr(755,root,root) %{_bindir}/rlatorle
+%attr(755,root,root) %{_bindir}/rleClock
+%attr(755,root,root) %{_bindir}/rleaddcom
+%attr(755,root,root) %{_bindir}/rlebg
+%attr(755,root,root) %{_bindir}/rlebox
+%attr(755,root,root) %{_bindir}/rlecat
+%attr(755,root,root) %{_bindir}/rleccube
+%attr(755,root,root) %{_bindir}/rlecomp
+%attr(755,root,root) %{_bindir}/rledither
+%attr(755,root,root) %{_bindir}/rleflip
+%attr(755,root,root) %{_bindir}/rlegrid
+%attr(755,root,root) %{_bindir}/rlehdr
+%attr(755,root,root) %{_bindir}/rlehisto
+%attr(755,root,root) %{_bindir}/rleldmap
+%attr(755,root,root) %{_bindir}/rlemandl
+%attr(755,root,root) %{_bindir}/rlenoise
+%attr(755,root,root) %{_bindir}/rlepatch
+%attr(755,root,root) %{_bindir}/rleprint
+%attr(755,root,root) %{_bindir}/rlequant
+%attr(755,root,root) %{_bindir}/rlescale
+%attr(755,root,root) %{_bindir}/rleselect
+%attr(755,root,root) %{_bindir}/rlesetbg
+%attr(755,root,root) %{_bindir}/rlespiff
+%attr(755,root,root) %{_bindir}/rlesplice
+%attr(755,root,root) %{_bindir}/rlesplit
+%attr(755,root,root) %{_bindir}/rlestereo
+%attr(755,root,root) %{_bindir}/rleswap
+%attr(755,root,root) %{_bindir}/rletoabA60
+%attr(755,root,root) %{_bindir}/rletoabA62
+%attr(755,root,root) %{_bindir}/rletoalias
+%attr(755,root,root) %{_bindir}/rletoascii
+%attr(755,root,root) %{_bindir}/rletogif
+%attr(755,root,root) %{_bindir}/rletogray
+%attr(755,root,root) %{_bindir}/rletopaint
+%attr(755,root,root) %{_bindir}/rletoppm
+%attr(755,root,root) %{_bindir}/rletops
+%attr(755,root,root) %{_bindir}/rletoraw
+%attr(755,root,root) %{_bindir}/rletorla
+%attr(755,root,root) %{_bindir}/rletotarga
+%attr(755,root,root) %{_bindir}/rletotiff
+%attr(755,root,root) %{_bindir}/rlezoom
+%attr(755,root,root) %{_bindir}/smush
+%attr(755,root,root) %{_bindir}/targatorle
+%attr(755,root,root) %{_bindir}/tifftorle
+%attr(755,root,root) %{_bindir}/to8
+%attr(755,root,root) %{_bindir}/tobw
+%attr(755,root,root) %{_bindir}/unexp
+%attr(755,root,root) %{_bindir}/unslice
+%attr(755,root,root) %{_bindir}/wasatchrle
+%attr(755,root,root) %{_bindir}/xbmtorle
+%{_mandir}/man1/aliastorle.1*
+%{_mandir}/man1/applymap.1*
+%{_mandir}/man1/avg4.1*
+%{_mandir}/man1/crop.1*
+%{_mandir}/man1/cubitorle.1*
+%{_mandir}/man1/dvirle.1*
+%{_mandir}/man1/fant.1*
+%{_mandir}/man1/get4d.1*
+%{_mandir}/man1/get_orion.1*
+%{_mandir}/man1/getami.1*
+%{_mandir}/man1/getap.1*
+%{_mandir}/man1/getbob.1*
+%{_mandir}/man1/getcx3d.1*
+%{_mandir}/man1/getfb.1*
+%{_mandir}/man1/getgmr.1*
+%{_mandir}/man1/getiris.1*
+%{_mandir}/man1/getmex.1*
+%{_mandir}/man1/getqcr.1*
+%{_mandir}/man1/getren.1*
+%{_mandir}/man1/getsun.1*
+%{_mandir}/man1/gettaac.1*
+%{_mandir}/man1/getx10.1*
+%{_mandir}/man1/getx11.1*
+%{_mandir}/man1/giftorle.1*
+%{_mandir}/man1/graytorle.1*
+%{_mandir}/man1/into.1*
+%{_mandir}/man1/mcut.1*
+%{_mandir}/man1/mergechan.1*
+%{_mandir}/man1/painttorle.1*
+%{_mandir}/man1/pgmtorle.1*
+%{_mandir}/man1/ppmtorle.1*
+%{_mandir}/man1/pyrmask.1*
+%{_mandir}/man1/rastorle.1*
+%{_mandir}/man1/rawtorle.1*
+%{_mandir}/man1/read98721.1*
+%{_mandir}/man1/repos.1*
+%{_mandir}/man1/rlatorle.1*
+%{_mandir}/man1/rleClock.1*
+%{_mandir}/man1/rleaddcom.1*
+%{_mandir}/man1/rleaddeof.1*
+%{_mandir}/man1/rlebg.1*
+%{_mandir}/man1/rlebox.1*
+%{_mandir}/man1/rlecat.1*
+%{_mandir}/man1/rleccube.1*
+%{_mandir}/man1/rlecomp.1*
+%{_mandir}/man1/rledither.1*
+%{_mandir}/man1/rleflip.1*
+%{_mandir}/man1/rlegrid.1*
+%{_mandir}/man1/rlehdr.1*
+%{_mandir}/man1/rlehisto.1*
+%{_mandir}/man1/rleinterp.1*
+%{_mandir}/man1/rleldmap.1*
+%{_mandir}/man1/rlemandl.1*
+%{_mandir}/man1/rlenoise.1*
+%{_mandir}/man1/rlepatch.1*
+%{_mandir}/man1/rleprint.1*
+%{_mandir}/man1/rlequant.1*
+%{_mandir}/man1/rlescale.1*
+%{_mandir}/man1/rleselect.1*
+%{_mandir}/man1/rlesetbg.1*
+%{_mandir}/man1/rlespiff.1*
+%{_mandir}/man1/rlesplice.1*
+%{_mandir}/man1/rlesplit.1*
+%{_mandir}/man1/rlestereo.1*
+%{_mandir}/man1/rleswap.1*
+%{_mandir}/man1/rletoabA60.1*
+%{_mandir}/man1/rletoabA62.1*
+%{_mandir}/man1/rletoalias.1*
+%{_mandir}/man1/rletoascii.1*
+%{_mandir}/man1/rletocgm.1*
+%{_mandir}/man1/rletogif.1*
+%{_mandir}/man1/rletogray.1*
+%{_mandir}/man1/rletopaint.1*
+%{_mandir}/man1/rletoppm.1*
+%{_mandir}/man1/rletops.1*
+%{_mandir}/man1/rletorast.1*
+%{_mandir}/man1/rletoraw.1*
+%{_mandir}/man1/rletorla.1*
+%{_mandir}/man1/rletotarga.1*
+%{_mandir}/man1/rletotiff.1*
+%{_mandir}/man1/rlezoom.1*
+%{_mandir}/man1/show3.1*
+%{_mandir}/man1/smush.1*
+%{_mandir}/man1/targatorle.1*
+%{_mandir}/man1/tifftorle.1*
+%{_mandir}/man1/to8.1*
+%{_mandir}/man1/tobw.1*
+%{_mandir}/man1/unexp.1*
+%{_mandir}/man1/unslice.1*
+%{_mandir}/man1/urt.1*
+%{_mandir}/man1/wasatchrle.1*
+
+%files libs
+%defattr(644,root,root,755)
%doc 3.1-changes CHANGES README blurb copyright
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.0
-%{_mandir}/man1/*
+%attr(755,root,root) %{_libdir}/librle.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/librle.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/librle.so
+%{_libdir}/librle.la
%{_includedir}/rle
-%{_mandir}/man[35]/*
+%{_mandir}/man3/buildmap.3*
+%{_mandir}/man3/bwdithermap.3*
+%{_mandir}/man3/colorquant.3*
+%{_mandir}/man3/dither*.3*
+%{_mandir}/man3/float_to_exp.3*
+%{_mandir}/man3/hilbert*.3*
+%{_mandir}/man3/inv_cmap.3*
+%{_mandir}/man3/librle.3*
+%{_mandir}/man3/make_square.3*
+%{_mandir}/man3/rgb_to_bw.3*
+%{_mandir}/man3/rle_*.3*
+%{_mandir}/man5/RLE.5*
+%{_mandir}/man5/rle.5*
%files static
%defattr(644,root,root,755)
diff --git a/urt-config.patch b/urt-config.patch
index 9e153d6..88a7f45 100644
--- a/urt-config.patch
+++ b/urt-config.patch
@@ -116,15 +116,6 @@ diff -Nur urt-3.1b.orig/config/urt urt-3.1b/config/urt
#endif
#ifdef X10
-@@ -227,6 +226,6 @@
- #endif
-
- #ifdef X11
--LIBX11 = -lX11
--INCX11 =
-+LIBX11 = -L/usr/X11R6/lib -lX11
-+INCX11 = -I/usr/X11R6/include
- #endif
diff -Nur urt-3.1b.orig/makefile.hdr urt-3.1b/makefile.hdr
--- urt-3.1b.orig/makefile.hdr Fri Mar 6 15:04:57 1992
+++ urt-3.1b/makefile.hdr Fri Oct 12 22:10:22 2001
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/urt.git/commitdiff/037b68fcf3378be5345cf750f34dae0bd1800028
More information about the pld-cvs-commit
mailing list