rpms/pari/F-13 gp.desktop, NONE, 1.1 pari-2.3.4-xdgopen.patch, NONE, 1.1 pari-init.el, NONE, 1.1 pari.spec, 1.13, 1.14

Paul Howarth pghmcfc at fedoraproject.org
Thu Jul 8 15:47:47 UTC 2010


Author: pghmcfc

Update of /cvs/pkgs/rpms/pari/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15936

Modified Files:
	pari.spec 
Added Files:
	gp.desktop pari-2.3.4-xdgopen.patch pari-init.el 
Log Message:
* Thu Jul  8 2010 Paul Howarth <paul at city-fan.org> - 2.3.4-5
- various clean-ups to pacify rpmlint:
  - uses spaces instead of tabs consistently
  - mark %{_datadir}/emacs/site-lisp/pari/pariemacs.txt as %doc
  - mark %{_datadir}/pari/{PARI,doc,examples} as %doc
  - fix permissions of gp
- don't strip gp so we get debuginfo for it
- move here documents out to separate source files
- make gp subpackage require same version-release of main package
- apply patch from Patrice Dumas to use xdg-open rather than xdvi to display
  DVI content, and move the xdg-open requirement from the main package to the
  gp sub-package (#530565)



--- NEW FILE gp.desktop ---
[Desktop Entry]
Name=PARI/GP
Comment=Programmable calculator based on PARI
Exec=gp
Icon=@DATADIR@/pari/misc/pari.xpm
Terminal=true
Type=Application
Categories=Application;Education;Math;
Encoding=UTF-8
X-Desktop-File-Install-Version=0.10

pari-2.3.4-xdgopen.patch:
 gphelp.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pari-2.3.4-xdgopen.patch ---
--- pari-2.3.4/doc/gphelp.in	2010-05-31 19:39:57.000000000 +0200
+++ pari-2.3.4/doc/gphelp.in	2010-05-31 19:40:20.000000000 +0200
@@ -47,8 +47,8 @@ $datadir= "@datadir@";
 # no expanded material (@key@) below
 $wwwsite= "http://pari.math.u-bordeaux.fr/";
 
-$xdvi = $ENV{GPXDVI} || "xdvi";
-$xdviref = $ENV{GPXDVIREF} || "$xdvi -paper 29.7x21cm";
+$xdvi = $ENV{GPXDVI} || "xdg-open";
+$xdviref = $ENV{GPXDVIREF} || "$xdvi";
 $gzip = "gzip";
 $zcat = "$gzip -dc";
 $docdir = &get_docdir();


--- NEW FILE pari-init.el ---
(add-to-list 'load-path "@DATADIR@/emacs/site-lisp/pari")
(autoload 'gp-mode "pari" nil t)
(autoload 'gp-script-mode "pari" nil t)
(autoload 'gp "pari" nil t)
(autoload 'gpman "pari" nil t)


Index: pari.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pari/F-13/pari.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- pari.spec	25 Jul 2009 23:15:37 -0000	1.13
+++ pari.spec	8 Jul 2010 15:47:47 -0000	1.14
@@ -1,22 +1,24 @@
 Name:           pari
 Version:        2.3.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Number Theory-oriented Computer Algebra System
 
 Group:          System Environment/Libraries
 # No version is specified.
 License:        GPL+
-URL:            http://pari.math.u-bordeaux.fr
-Source:		http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.4.tar.gz
+URL:            http://pari.math.u-bordeaux.fr/
+Source0:        http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{version}.tar.gz
+Source1:        pari-init.el
+Source2:        gp.desktop
+Patch0:         pari-2.3.4-xdgopen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	emacs
-BuildRequires:	readline-devel
-BuildRequires:	gmp-devel
-BuildRequires:	tetex
-BuildRequires:	tetex-dvips
+BuildRequires:  emacs
+BuildRequires:  readline-devel
+BuildRequires:  gmp-devel
+BuildRequires:  tetex
+BuildRequires:  tetex-dvips
 BuildRequires:  desktop-file-utils
-BuildRequires:	libX11-devel
-Requires:	tetex-xdvi
+BuildRequires:  libX11-devel
 
 
 %description
@@ -32,18 +34,21 @@ calculator PARI/GP is in package %{name}
 
 
 %package devel
-Summary:	Header files and libraries for PARI development
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Summary:        Header files and libraries for PARI development
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 Header files and libraries for PARI development.
 
 
 %package gp
-Summary:	PARI calculator
-Group:		Applications/Engineering
-Requires:	gzip
+Summary:        PARI calculator
+Group:          Applications/Engineering
+Requires:       %{name} = %{version}-%{release}
+Requires:       gzip
+Requires:       xdg-utils
+Requires:       mimehandler(application/x-dvi)
 
 %description gp
 PARI/GP is an advanced programmable calculator, which computes
@@ -52,10 +57,10 @@ contains a wealth of number-theoretic fu
 
 
 %package emacs
-Summary:	Emacs mode for PARI/GP
-Group:		Applications/Engineering
-Requires:	emacs-common
-Requires:	%{name}-gp = %{version}-%{release}
+Summary:        Emacs mode for PARI/GP
+Group:          Applications/Engineering
+Requires:       emacs-common
+Requires:       %{name}-gp = %{version}-%{release}
 
 %description emacs
 Emacs mode for PARI/GP.
@@ -63,7 +68,13 @@ Emacs mode for PARI/GP.
 
 %prep
 %setup -q
+
+# Use xdg-open rather than xdvi to display DVI files (#530565)
+%patch0 -p1 -b .xdgopen
+
 sed -i "s|runpathprefix='.*'|runpathprefix=''|" config/get_ld
+sed -e 's|@DATADIR@|%{_datadir}|' %{SOURCE1} > pari-init.el
+sed -e 's|@DATADIR@|%{_datadir}|' %{SOURCE2} > gp.desktop
 
 
 %build
@@ -90,32 +101,12 @@ make dotest-round4
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true
 
 # we move pari.cfg to the docdir
 rm -fr $RPM_BUILD_ROOT%{_prefix}/lib/pari
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-cat >  $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/pari-init.el <<EOF
-(add-to-list 'load-path "%{_datadir}/emacs/site-lisp/pari")
-(autoload 'gp-mode "pari" nil t)
-(autoload 'gp-script-mode "pari" nil t)
-(autoload 'gp "pari" nil t)
-(autoload 'gpman "pari" nil t)
-EOF
-
-cat > gp.desktop <<EOF
-[Desktop Entry]
-Name=PARI/GP
-Comment=Programmable calculator based on PARI
-Exec=gp
-Icon=%{_datadir}/pari/misc/pari.xpm
-Terminal=true
-Type=Application
-Categories=Application;Education;Math;
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
-EOF
+install -D -m 644 pari-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/pari-init.el
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -145,24 +136,47 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gp
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/pari
+%attr(0755,root,root) %{_bindir}/*
+%dir %{_datadir}/pari/
+%doc %{_datadir}/pari/PARI/
+%doc %{_datadir}/pari/doc/
+%doc %{_datadir}/pari/examples/
+%{_datadir}/pari/misc/
+%{_datadir}/pari/pari.desc
 %{_datadir}/applications/*
 %{_mandir}/man*/*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/pari
+%{_includedir}/pari/
 %{_libdir}/*.so
 
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*
+%dir %{_datadir}/emacs/site-lisp/pari/
+%doc %{_datadir}/emacs/site-lisp/pari/pariemacs.txt
+%{_datadir}/emacs/site-lisp/pari/*.el*
+%{_datadir}/emacs/site-lisp/site-start.d/pari-init.el
 
 
 %changelog
+* Thu Jul  8 2010 Paul Howarth <paul at city-fan.org> - 2.3.4-5
+- various clean-ups to pacify rpmlint:
+  - uses spaces instead of tabs consistently
+  - mark %%{_datadir}/emacs/site-lisp/pari/pariemacs.txt as %%doc
+  - mark %%{_datadir}/pari/{PARI,doc,examples} as %%doc
+  - fix permissions of gp
+- don't strip gp so we get debuginfo for it
+- move here documents out to separate source files
+- make gp subpackage require same version-release of main package
+
+* Wed Jul  7 2010 Paul Howarth <paul at city-fan.org> - 2.3.4-4
+- apply patch from Patrice Dumas to use xdg-open rather than xdvi to display
+  DVI content, and move the xdg-open requirement from the main package to the
+  gp sub-package (#530565)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 



More information about the scm-commits mailing list