Attachment 202811 Details for Bug 225849 – fixes for the spec file

[patch] fixes for the spec file

gnuplot.spec.diff (text/plain), 4.10 KB, created by Patrice Dumas on 2007-09-21 20:46:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-09-21 20:46:18 UTC

Size: 4.10 KB

patch

obsolete

>? .build-4.2.0-5.fc8.log
>? gnuplot-4.2.0
>? gnuplot-4.2.0-5.fc8.src.rpm
>? i386
>Index: gnuplot.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/gnuplot/devel/gnuplot.spec,v
>retrieving revision 1.43
>diff -u -3 -p -r1.43 gnuplot.spec
>--- gnuplot.spec	7 Sep 2007 08:46:37 -0000	1.43
>+++ gnuplot.spec	21 Sep 2007 20:41:13 -0000
>@@ -2,6 +2,8 @@
> %define minor 2
> %define patchlevel 0
> 
>+%define x11_app_defaults_dir %{_datadir}/X11/app-defaults
>+
> Summary: A program for plotting mathematical expressions and data
> Name: gnuplot
> Version: %{major}.%{minor}.%{patchlevel}
>@@ -12,11 +14,11 @@ Group: Applications/Engineering
> Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
> Source2: gnuplot-init.el
> Patch1: gnuplot-4.2.0-refers_to.patch
>-Patch2: gnuplot-4.2.0-ver.patch
> BuildRequires: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs
> BuildRequires: texinfo, readline-devel, libXt-devel, gd-devel
>-BuildRequires: latex2html, gnuplot
>-Requires: libpng
>+BuildRequires: latex2html
>+Requires(post): /sbin/install-info
>+Requires(preun): /sbin/install-info
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: http://www.gnuplot.info/
> 
>@@ -41,37 +43,44 @@ nicely interacts and integrates into ema
> %prep
> %setup -q
> %patch1 -p1 -b .refto
>-%patch2 -p1 -b .ver
>+
>+sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
> 
> %build
> %configure --with-readline=gnu --with-png --without-linux-vga \
>  --enable-history-file
> 
>-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
>+make %{?_smp_mflags} INSTALL='install -p'
> 
> cd docs
> make html
> cd psdoc
>-make 
>+export GNUPLOT_PS_DIR=../../term/PostScript/
> make ps_symbols.ps ps_fontfile_doc.pdf
> 
> %install
> rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
> install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/
>-install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
>+install -p -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
> rm -f $RPM_BUILD_ROOT%{_infodir}/dir
> rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/info-look*.el*
> install -d ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/gnuplot
> mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
> mv $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot-gui.el{,c} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/gnuplot
> 
>+mkdir -p $RPM_BUILD_ROOT%{x11_app_defaults_dir}
>+mv $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/Gnuplot.app-defaults $RPM_BUILD_ROOT%{x11_app_defaults_dir}/Gnuplot
>+rm -rf $RPM_BUILD_ROOT%{_libdir}/
>+
>+chmod a-x demo/html/webify.pl
>+
> %post 
>-/sbin/install-info --quiet %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
>+/sbin/install-info %{_infodir}/gnuplot.info %{_infodir}/dir || :
> 
> %preun
> if [ "$1" = "0" ] ; then # last uninstall
>-   /sbin/install-info --delete %{_infodir}/gnuplot.info.gz %{_infodir}/dir || :
>+   /sbin/install-info --delete %{_infodir}/gnuplot.info %{_infodir}/dir || :
> fi
> 
> %clean
>@@ -80,8 +89,9 @@ rm -rf $RPM_BUILD_ROOT
> %files
> %defattr(-,root,root,-)
> %doc BUGS ChangeLog Copyright FAQ NEWS README TODO 
>-%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo docs/psdoc/ps_file.doc 
>-%doc docs/psdoc/ps_fontfile_doc.pdf
>+%doc docs/htmldocs
>+%doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps tutorial/tutorial.dvi demo
>+%doc docs/psdoc/ps_file.doc docs/psdoc/ps_fontfile_doc.pdf
> %dir %{_libexecdir}/gnuplot
> %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
> %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
>@@ -92,8 +102,12 @@ rm -rf $RPM_BUILD_ROOT
> %dir %{_datadir}/gnuplot/%{major}.%{minor}/PostScript
> %{_datadir}/gnuplot/%{major}.%{minor}/PostScript/*.ps
> %{_datadir}/gnuplot/%{major}.%{minor}/gnuplot.gih
>+%dir %{_datadir}/texmf
>+%dir %{_datadir}/texmf/tex
>+%dir %{_datadir}/texmf/tex/latex
>+%dir %{_datadir}/texmf/tex/latex/gnuplot
> %{_datadir}/texmf/tex/latex/gnuplot/gnuplot.cfg
>-%{_libdir}/X11/app-defaults/Gnuplot.app-defaults
>+%{x11_app_defaults_dir}/Gnuplot
> %{_infodir}/gnuplot.info.gz
> 
> %files emacs

Actions: View | Diff

Attachments on bug 225849: 202811