- add emacs buildrequires

- add emacs-* macros
- remove useless iconv
This commit is contained in:
Ivana Varekova 2007-11-01 15:19:41 +00:00
parent 9850fcdabf
commit 2adc75ac39

View File

@ -4,10 +4,14 @@
%define x11_app_defaults_dir %{_datadir}/X11/app-defaults %define x11_app_defaults_dir %{_datadir}/X11/app-defaults
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
Summary: A program for plotting mathematical expressions and data Summary: A program for plotting mathematical expressions and data
Name: gnuplot Name: gnuplot
Version: %{major}.%{minor}.%{patchlevel} Version: %{major}.%{minor}.%{patchlevel}
Release: 2%{?dist} Release: 3%{?dist}
# Modifications are to be distributed as patches to the released version. # Modifications are to be distributed as patches to the released version.
License: gnuplot and GPLv2 License: gnuplot and GPLv2
Group: Applications/Engineering Group: Applications/Engineering
@ -35,7 +39,8 @@ representation.
Group: Applications/Engineering Group: Applications/Engineering
Summary: Emacs bindings for the gnuplot main application Summary: Emacs bindings for the gnuplot main application
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: emacs BuildRequires: emacs emacs-el
Requires: emacs >= %{emacs_version}
%description -n emacs-%{name} %description -n emacs-%{name}
The gnuplot-emacs package contains the emacs related .elc files so that gnuplot The gnuplot-emacs package contains the emacs related .elc files so that gnuplot
@ -56,14 +61,6 @@ nicely interacts and integrates into emacs.
sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux
mv ChangeLog.aux ChangeLog mv ChangeLog.aux ChangeLog
iconv -f windows-1252 -t utf-8 demo/fontfile_latex.dem >demo/fontfile_latex.dem.aux
mv demo/fontfile_latex.dem.aux demo/fontfile_latex.dem
iconv -f iso-8859-1 -t utf-8 demo/demo.edf >demo/demo.edf.aux
mv demo/demo.edf.aux demo/demo.edf
iconv -f windows-1252 -t utf-8 demo/epslatex.dem >demo/epslatex.dem.aux
mv demo/epslatex.dem.aux demo/epslatex.dem
iconv -f windows-1252 -t utf-8 demo/fontfile.dem >demo/fontfile.dem.aux
mv demo/fontfile.dem.aux demo/fontfile.dem
chmod 644 src/getcolor.h chmod 644 src/getcolor.h
%build %build
@ -132,18 +129,21 @@ rm -rf $RPM_BUILD_ROOT
%files -n emacs-%{name} %files -n emacs-%{name}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog Copyright %doc ChangeLog Copyright
%dir %{_datadir}/emacs/site-lisp/gnuplot/ %dir %{emacs_lispdir}/%{name}
%{_datadir}/emacs/site-lisp/gnuplot/gnuplot-gui.elc %{emacs_lispdir}/%{name}/*.elc
%{_datadir}/emacs/site-lisp/gnuplot/gnuplot.elc %{emacs_startdir}/*.el
%{_datadir}/emacs/site-lisp/site-start.d/gnuplot-init.el
%files -n emacs-%{name}-el %files -n emacs-%{name}-el
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog Copyright %doc ChangeLog Copyright
%{_datadir}/emacs/site-lisp/gnuplot/gnuplot-gui.el %{emacs_lispdir}/%{name}/*.el
%{_datadir}/emacs/site-lisp/gnuplot/gnuplot.el
%changelog %changelog
* Thu Nov 1 2007 Ivana Varekova <varekova@redhat.com> - 4.2.2-3
- add emacs buildrequires
- add emacs-* macros
- remove useless iconv
* Thu Oct 25 2007 Ivana Varekova <varekova@redhat.com> - 4.2.2-2 * Thu Oct 25 2007 Ivana Varekova <varekova@redhat.com> - 4.2.2-2
- rename emacs subpackage, split intwo two parts - rename emacs subpackage, split intwo two parts
- add font directories - add font directories