[plotutils/f15/master] Update to 2.6
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed Mar 2 09:24:29 UTC 2011
commit bf89df4a34aca2cbb8ff7f58568a9191f829fd1e
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Wed Mar 2 10:12:51 2011 +0100
Update to 2.6
.gitignore | 1 +
plotutils.spec | 25 ++++++++++++-------------
sources | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2caa024..c83fd14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plotutils-2.5.tar.gz
+/plotutils-2.6.tar.gz
diff --git a/plotutils.spec b/plotutils.spec
index f8edfc4..1edd754 100644
--- a/plotutils.spec
+++ b/plotutils.spec
@@ -1,14 +1,13 @@
Name: plotutils
-Version: 2.5
-Release: 8%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Summary: GNU vector and raster graphics utilities and libraries
Group: Applications/Productivity
License: GPLv2+
URL: http://www.gnu.org/software/plotutils/
Source0: ftp://ftp.gnu.org/gnu/plotutils/plotutils-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex
BuildRequires: libpng-devel
@@ -44,20 +43,20 @@ applications
%prep
%setup -q
-cp -f lib/fontlist.c graph/
-cp -f lib/fontlist.c plot/
-cp -f lib/fontlist.c pic2plot/
-cp -f lib/fontlist.c plotfont/
-cp -f lib/fontlist.c tek2plot/
%build
%configure --disable-static --enable-libplotter --enable-libxmi --enable-ps-fonts-in-pcl
+
+# fix rpath handling
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT docs-to-include
+rm -rf docs-to-include
make install DESTDIR=$RPM_BUILD_ROOT
mkdir docs-to-include
mv ${RPM_BUILD_ROOT}%{_datadir}/ode docs-to-include
@@ -68,10 +67,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
/sbin/install-info %{_infodir}/libxmi.info %{_infodir}/dir || :
/sbin/install-info %{_infodir}/plotutils.info %{_infodir}/dir || :
@@ -100,6 +95,7 @@ fi
%{_bindir}/plotfont
%{_bindir}/spline
%{_bindir}/tek2plot
+%{_bindir}/hersheydemo
%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_infodir}/*.info*
@@ -113,6 +109,9 @@ fi
%changelog
+* Wed Mar 2 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.6-1
+- Update to 2.6
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index b3e0e59..ea87bd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d6855cce17832afe2ff75c26a57be49 plotutils-2.5.tar.gz
+c08a424bd2438c80a786a7f4b5bb6a40 plotutils-2.6.tar.gz
More information about the scm-commits
mailing list