Attachment 5094 Details for Bug 13147 – Proposal for a fix to the buggy spec file in xemacs-21.4.22.src.rpm

[patch] Proposal for a fix to the buggy spec file in xemacs-21.4.22.src.rpm

xemacs-21.4.22-spec.patch (text/plain), 1.27 KB, created by Gilles Allard on 2014-04-04 16:18:49 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Gilles Allard

Created: 2014-04-04 16:18:49 CEST

Size: 1.27 KB

patch

obsolete

>--- ./SPECS/xemacs.spec	2014-04-04 15:48:46.838609740 +0000
>+++ ./SPECS/xemacs.spec~	2013-10-21 12:37:38.000000000 +0000
>@@ -259,8 +259,6 @@
> }
>     
> %install
>-rm -rf %{buildroot}
>-
> pushd building/$RPM_ARCH-linux
> %makeinstall mandir=%{buildroot}/%{_mandir}/man1  lockdir=%{buildroot}/var/lock/xemacs
> popd
>@@ -309,11 +307,11 @@
> mkdir -p %{buildroot}/etc/emacs/
> install -m644 %{SOURCE5} %{buildroot}/etc/emacs/site-start-xemacs.el
> pushd %{buildroot}/%{_datadir}/xemacs-%{version}/lisp/ && \
>-ln -sf ../../../../etc/emacs/site-start-xemacs.el site-start.el && popd
>+ln -s ../../../../etc/emacs/site-start-xemacs.el site-start.el && popd
> 
>-mkdir -p %{buildroot}%{_sysconfdir}/emacs/site-start.d
>+mkdir %{buildroot}%{_sysconfdir}/emacs/site-start.d
> 
>-mkdir -p %{buildroot}%{_datadir}/applications
>+mkdir %{buildroot}%{_datadir}/applications
> cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
> [Desktop Entry]
> Name=Xemacs
>@@ -367,7 +365,7 @@
>   sed -e "s#^%{buildroot}##g" > rpm-devel-files
> 
> find $DIR $LIBDIR -name $EL -not -name "site-start.el" $ANSPECIALEL -type f |
>-  sed -e "s#^%{buildroot}##g" >> rpm-files
>+  sed -e "s#^%{buildroot}##g" > rpm-files
> 
> find $PACKAGES -name $EL -not -name "site-start.el" $ANSPECIALEL -type f |
>   sed -e "s#^%{buildroot}##g" > rpm-el-files

--- ./SPECS/xemacs.spec	2014-04-04 15:48:46.838609740 +0000
+++ ./SPECS/xemacs.spec~	2013-10-21 12:37:38.000000000 +0000
@@ -259,8 +259,6 @@
 }
     
 %install
-rm -rf %{buildroot}
-
 pushd building/$RPM_ARCH-linux
 %makeinstall mandir=%{buildroot}/%{_mandir}/man1  lockdir=%{buildroot}/var/lock/xemacs
 popd
@@ -309,11 +307,11 @@
 mkdir -p %{buildroot}/etc/emacs/
 install -m644 %{SOURCE5} %{buildroot}/etc/emacs/site-start-xemacs.el
 pushd %{buildroot}/%{_datadir}/xemacs-%{version}/lisp/ && \
-ln -sf ../../../../etc/emacs/site-start-xemacs.el site-start.el && popd
+ln -s ../../../../etc/emacs/site-start-xemacs.el site-start.el && popd
 
-mkdir -p %{buildroot}%{_sysconfdir}/emacs/site-start.d
+mkdir %{buildroot}%{_sysconfdir}/emacs/site-start.d
 
-mkdir -p %{buildroot}%{_datadir}/applications
+mkdir %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
 [Desktop Entry]
 Name=Xemacs
@@ -367,7 +365,7 @@
   sed -e "s#^%{buildroot}##g" > rpm-devel-files
 
 find $DIR $LIBDIR -name $EL -not -name "site-start.el" $ANSPECIALEL -type f |
-  sed -e "s#^%{buildroot}##g" >> rpm-files
+  sed -e "s#^%{buildroot}##g" > rpm-files
 
 find $PACKAGES -name $EL -not -name "site-start.el" $ANSPECIALEL -type f |
   sed -e "s#^%{buildroot}##g" > rpm-el-files

Actions: View | Diff

Attachments on bug 13147: 5094