rpms/aplus-fsf/devel aplus-fsf.spec,1.35,1.36

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30276

Modified Files:
	aplus-fsf.spec 
Log Message:
Fix unowned fontdir issue


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- aplus-fsf.spec	18 Jan 2009 20:39:46 -0000	1.35
+++ aplus-fsf.spec	1 Feb 2009 19:36:37 -0000	1.36
@@ -3,16 +3,24 @@
 %define ver 4.22
 %define rel 4
 
+%if %($(pkg-config xemacs) ; echo $?)
+%define xemacs_version 21.5
+%define xemacs_lispdir %{_datadir}/xemacs/site-packages
+%define xemacs_startdir %{_datadir}/xemacs/site-packages/site-start.d
+%else
+%define xemacs_version %(pkg-config xemacs --modversion)
+%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
+%define xemacs_startdir %(pkg-config xemacs --variable sitestartdir)
+%endif
+
 %define _x11pref %{_datadir}/X11
 %define _x11bindir %{_bindir}
-%define _lispdir %{_datadir}/xemacs/site-packages/lisp
-%define _lispstart %{_lispdir}/site-start.d
 %define _x11lib %{_libdir}
 %define _x11appdef %{_x11pref}/app-defaults
 
 Name: %name
 Version: 4.22.4
-Release: 11%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -33,6 +41,7 @@
 BuildRequires: xorg-x11-font-utils
 BuildRequires: automake autoconf
 BuildRequires: fontpackages-devel
+BuildRequires: xemacs, xemacs-devel
 
 Requires: xterm
 
@@ -60,7 +69,6 @@
 
 Requires: fontpackages-filesystem
 
-
 %description KAPL-fonts
 The A+ programming language development environment requires these 
 APL fonts to properly display A+ code in XTerm or XEmacs.
@@ -118,8 +126,8 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
 echo '%{_libdir}/aplus-fsf/%{version}' >$RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
 
-mkdir -p $RPM_BUILD_ROOT/%{_lispstart}/aplus-fsf
-cp %{SOURCE1} $RPM_BUILD_ROOT/%{_lispstart}/aplus-fsf-init.el
+mkdir -p $RPM_BUILD_ROOT/%{xemacs_startdir}/aplus-fsf
+cp %{SOURCE1} $RPM_BUILD_ROOT/%{xemacs_startdir}/aplus-fsf-init.el
 
 pushd $RPM_BUILD_ROOT/%{_x11appdef}
 mv XTerm XTerm-apl
@@ -142,7 +150,19 @@
 
 %postun -p /sbin/ldconfig
 
-%_font_pkg -n KAPL *.TTF
+%post KAPL-fonts
+if [ -x %{_bindir}/fc-cache ] ; then
+   %{_bindir}/fc-cache %{_fontdir} || :
+fi
+
+%postun KAPL-fonts
+if [ -x %{_bindir}/fc-cache ] ; then
+   %{_bindir}/fc-cache %{_fontdir} || :
+fi
+
+%files KAPL-fonts
+%defattr(-,root,root)
+%{_fontdir}/
 
 %files
 %defattr(-,root,root,-)
@@ -164,10 +184,16 @@
 
 %files -n xemacs-%{name}
 %defattr(-,root,root,-)
-%{_lispdir}/aplus-fsf
-%{_lispstart}/aplus-fsf-init.el
+%{xemacs_lispdir}/aplus-fsf/*.el
+%{xemacs_startdir}/aplus-fsf-init.el
 
 %Changelog
+* Sun Feb  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-13
+- Fix unowned fontdir issue (#483325)
+
+* Mon Jan 26 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-12
+- Adapt package to Emacs packaging guidelines
+
 * Sun Jan 18 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-11
 - Add font family name to font subpackage name