X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=grace.spec;h=dae892b6f6bc93b8c18e2be5c9e69e9fedff8bde;hb=HEAD;hp=95f881742251bebfd98afbb9df677c494c0e39d9;hpb=087100ee0145c32e846fe8d757e3a4d180c5ba39;p=packages%2Fgrace.git

diff --git a/grace.spec b/grace.spec
index 95f8817..dae892b 100644
--- a/grace.spec
+++ b/grace.spec
@@ -1,18 +1,24 @@
+#
+# Conditional build:
+%bcond_with	pdflib	# PDF driver (based on PDFlib, non-free)
+
 Summary:	Numerical Data Processing and Visualization Tool (grace)
 Summary(pl.UTF-8):	Narzędzie do numerycznej obróbki i wizualizacji danych
 Name:		grace
-Version:	5.1.21
-Release:	4
-License:	GPL
+Version:	5.1.25
+Release:	3
+License:	GPL v2+
 Group:		Applications/Math
 Source0:	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/%{name}-%{version}.tar.gz
-# Source0-md5:	db02dee3c68179c41452e652bd469bb9
+# Source0-md5:	c0482b1f18b113192946a96f5ff35a4d
 Source1:	%{name}.desktop
 Patch0:		%{name}-FHS.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-etc.patch
 Patch3:		%{name}-fontsdir.patch
-URL:		http://plasma-gate.weizmann.ac.il/Grace/
+Patch4:		source-hardening.diff
+Patch5:		%{name}-ac+tirpc.patch
+URL:		https://plasma-gate.weizmann.ac.il/Grace/
 BuildRequires:	Xbae-devel
 BuildRequires:	XmHTML-devel >= 1.1.5
 BuildRequires:	autoconf
@@ -20,17 +26,17 @@ BuildRequires:	automake
 BuildRequires:	fftw-devel >= 2.1.3
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 0.9.6
-BuildRequires:	libtiff-devel
+BuildRequires:	libtirpc-devel
 BuildRequires:	motif-devel >= 1.2
 BuildRequires:	netcdf-devel >= 3.0
-#BuildRequires:	pdflib-devel >= 5.0.0
+%{?with_pdflib:BuildRequires:	pdflib-lite-devel >= 5.0.0}
 BuildRequires:	t1lib-devel >= 5.0.0
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-lib-libXt-devel
 Requires:	fonts-Type1-urw
 Requires:	libpng >= 0.9.6
-#Requires:	pdflib >= 5.0.0
+%{?with_pdflib:Requires:	pdflib-lite >= 5.0.0}
 Requires:	zlib >= 1.0.3
 Obsoletes:	xmgr
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,18 +63,18 @@ do publikacji.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* ac-tools
-cp -f ac-tools/configure.in .
-%{__autoconf}
+%{__autoconf} ac-tools/configure.in > configure
 %configure \
-	--enable-grace-home=%{_datadir}/%{name} \
+	%{!?debug:--disable-debug} \
 	--enable-editres \
-	--enable-extra-incpath=$PKG_BUILD_DIR/include \
-	--enable-extra-ldpath=$PKG_BUILD_DIR/lib \
-	--without-bundled-xbae \
-	%{!?debug:--disable-debug}
+	--enable-grace-home=%{_datadir}/%{name} \
+	%{!?with_pdflib:--disable-pdfdrv} \
+	--without-bundled-xbae
 %{__make}
 
 %install
@@ -77,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/grace/doc/{*.sgml,*.dvi,*.1} \
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.1 \
 	$RPM_BUILD_ROOT%{_datadir}/grace/examples/dotest
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
@@ -96,11 +102,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/grace/doc
 %{_datadir}/grace/examples
 %dir %{_sysconfdir}/grace
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grace/*
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grace/gracerc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grace/gracerc.user
+%attr(755,root,root) %{_bindir}/convcal
+%attr(755,root,root) %{_bindir}/fdf2fit
+%attr(755,root,root) %{_bindir}/gracebat
+%attr(755,root,root) %{_bindir}/grconvert
+%attr(755,root,root) %{_bindir}/xmgrace
+%{_mandir}/man1/convcal.1*
+%{_mandir}/man1/grace.1*
+%{_mandir}/man1/gracebat.1*
+%{_mandir}/man1/grconvert.1*
+%{_mandir}/man1/xmgrace.1*
 %{_libdir}/grace
-%{_includedir}/*
+%{_includedir}/grace_np.h
 %dir %{_datadir}/grace
 %{_datadir}/grace/auxiliary
 %dir %{_datadir}/grace/templates
@@ -109,4 +124,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/grace/fonts/enc
 %{_datadir}/grace/fonts/type1
 %{_datadir}/grace/fonts/FontDataBase
-%{_desktopdir}/*.desktop
+%{_desktopdir}/grace.desktop