Attachment 5300 Details for Bug 13771 – Path to "autoconf" spec file to improve .el files processing (example)

[patch] Path to "autoconf" spec file to improve .el files processing (example)

autoconf-spec-patch-for-emacs-xemacs.patch (text/plain), 2.48 KB, created by Gilles Allard on 2014-07-20 08:53:37 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Gilles Allard

Created: 2014-07-20 08:53:37 CEST

Size: 2.48 KB

patch

obsolete

>--- ./autoconf.spec~	2013-01-11 12:40:27.000000000 +0000
>+++ ./autoconf.spec	2014-07-20 08:11:29.427559536 +0000
>@@ -5,6 +5,11 @@
> %define docheck 1
> %{?_without_check: %global docheck 0}
> 
>+%if %(rpm --quiet --query emacs xemacs; echo $?) < 2
>+%define _emacs		%(rpm --quiet --query emacs && echo emacs || echo xemacs)
>+%define lisp_dir	%{_emacs}
>+%endif
>+
> Name:		%{name}
> Summary:	A GNU tool for automatically configuring source code
> Version:	%{version}
>@@ -67,12 +72,12 @@
> rm -f $RPM_BUILD_ROOT%{_infodir}/standards*
> 
> # emacs stuff
>-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/emacs/site-start.d/%{name}.el
>+install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{lisp_dir}/site-start.d/%{name}.el
> 
> # if emacs-bin was not here, *.el and *.elc files will be missing - install *.el files anyway
>-if [ ! -d $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp ]; then
>-	mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
>-	install -m644 lib/emacs/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
>+if [ ! -d $RPM_BUILD_ROOT/%{_datadir}/%{lisp_dir}/site-lisp ]; then
>+	mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{lisp_dir}/site-lisp
>+	install -m644 lib/emacs/*.el $RPM_BUILD_ROOT/%{_datadir}/%{lisp_dir}/site-lisp
> fi
> 
> %if %docheck
>@@ -83,16 +88,30 @@
> %post
> %_install_info autoconf.info
> 
>+[ `rpm --quiet --query emacs xemacs; echo $?` -lt 2 ] && { LISP_DIR=`rpm --quiet --query emacs && echo emacs || echo xemacs`; }
>+[ -n "$LISP_DIR" -a "$LISP_DIR" != "%{lisp_dir}" ] && { \
>+    mkdir -p %{_datadir}/$LISP_DIR/site-lisp/; \
>+    mkdir -p %{_sysconfdir}/$LISP_DIR/site-start.d; \
>+    mv %{_datadir}/%{lisp_dir}/site-lisp/autoconf-mode.el{,c} %{_datadir}/$LISP_DIR/site-lisp/; \
>+    mv %{_sysconfdir}/%{lisp_dir}/site-start.d/%{name}.el %{_sysconfdir}/$LISP_DIR/site-start.d; \
>+} || :
>+
> %preun
> %_remove_install_info autoconf.info
> 
>+[ `rpm --quiet --query emacs xemacs; echo $?` -lt 2 ] && { LISP_DIR=`rpm --quiet --query emacs && echo emacs || echo xemacs`; }
>+[ -n "$LISP_DIR" -a "$LISP_DIR" != "%{lisp_dir}" ] && { \
>+    rm -f %{_datadir}/$LISP_DIR/site-lisp/autoconf-mode.el{,c}; \
>+    rm -f %{_sysconfdir}/$LISP_DIR/site-start.d/%{name}.el; \
>+} || :
>+
> %files
> %defattr(-,root,root)
> %doc AUTHORS BUGS COPYING INSTALL NEWS README THANKS TODO
>-%config(noreplace) %{_sysconfdir}/emacs/site-start.d/*.el
>+%config(noreplace) %{_sysconfdir}/%{lisp_dir}/site-start.d/*.el
> %{_bindir}/*
> %{_datadir}/autoconf
>-%{_datadir}/emacs/site-lisp/*.el*
>+%{_datadir}/%{lisp_dir}/site-lisp/*.el*
> %{_infodir}/*
> %{_mandir}/*/*
>

--- ./autoconf.spec~	2013-01-11 12:40:27.000000000 +0000
+++ ./autoconf.spec	2014-07-20 08:11:29.427559536 +0000
@@ -5,6 +5,11 @@
 %define docheck 1
 %{?_without_check: %global docheck 0}
 
+%if %(rpm --quiet --query emacs xemacs; echo $?) < 2
+%define _emacs		%(rpm --quiet --query emacs && echo emacs || echo xemacs)
+%define lisp_dir	%{_emacs}
+%endif
+
 Name:		%{name}
 Summary:	A GNU tool for automatically configuring source code
 Version:	%{version}
@@ -67,12 +72,12 @@
 rm -f $RPM_BUILD_ROOT%{_infodir}/standards*
 
 # emacs stuff
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/emacs/site-start.d/%{name}.el
+install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{lisp_dir}/site-start.d/%{name}.el
 
 # if emacs-bin was not here, *.el and *.elc files will be missing - install *.el files anyway
-if [ ! -d $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp ]; then
-	mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
-	install -m644 lib/emacs/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
+if [ ! -d $RPM_BUILD_ROOT/%{_datadir}/%{lisp_dir}/site-lisp ]; then
+	mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{lisp_dir}/site-lisp
+	install -m644 lib/emacs/*.el $RPM_BUILD_ROOT/%{_datadir}/%{lisp_dir}/site-lisp
 fi
 
 %if %docheck
@@ -83,16 +88,30 @@
 %post
 %_install_info autoconf.info
 
+[ `rpm --quiet --query emacs xemacs; echo $?` -lt 2 ] && { LISP_DIR=`rpm --quiet --query emacs && echo emacs || echo xemacs`; }
+[ -n "$LISP_DIR" -a "$LISP_DIR" != "%{lisp_dir}" ] && { \
+    mkdir -p %{_datadir}/$LISP_DIR/site-lisp/; \
+    mkdir -p %{_sysconfdir}/$LISP_DIR/site-start.d; \
+    mv %{_datadir}/%{lisp_dir}/site-lisp/autoconf-mode.el{,c} %{_datadir}/$LISP_DIR/site-lisp/; \
+    mv %{_sysconfdir}/%{lisp_dir}/site-start.d/%{name}.el %{_sysconfdir}/$LISP_DIR/site-start.d; \
+} || :
+
 %preun
 %_remove_install_info autoconf.info
 
+[ `rpm --quiet --query emacs xemacs; echo $?` -lt 2 ] && { LISP_DIR=`rpm --quiet --query emacs && echo emacs || echo xemacs`; }
+[ -n "$LISP_DIR" -a "$LISP_DIR" != "%{lisp_dir}" ] && { \
+    rm -f %{_datadir}/$LISP_DIR/site-lisp/autoconf-mode.el{,c}; \
+    rm -f %{_sysconfdir}/$LISP_DIR/site-start.d/%{name}.el; \
+} || :
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING INSTALL NEWS README THANKS TODO
-%config(noreplace) %{_sysconfdir}/emacs/site-start.d/*.el
+%config(noreplace) %{_sysconfdir}/%{lisp_dir}/site-start.d/*.el
 %{_bindir}/*
 %{_datadir}/autoconf
-%{_datadir}/emacs/site-lisp/*.el*
+%{_datadir}/%{lisp_dir}/site-lisp/*.el*
 %{_infodir}/*
 %{_mandir}/*/*

Actions: View | Diff

Attachments on bug 13771: 5300