[goffice/f20] Patched the bogus DESTDIR out

belegdol belegdol at fedoraproject.org
Tue Mar 4 20:28:07 UTC 2014


commit 3228fed0e92f88e431359e4f0d9af15ee42cb09d
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Tue Mar 4 21:26:56 2014 +0100

    Patched the bogus DESTDIR out

 goffice-0.10.12-destdir.patch |   61 +++++++++++++++++++++++++++++++++++++++++
 goffice.spec                  |    3 ++
 2 files changed, 64 insertions(+), 0 deletions(-)
---
diff --git a/goffice-0.10.12-destdir.patch b/goffice-0.10.12-destdir.patch
new file mode 100644
index 0000000..418d522
--- /dev/null
+++ b/goffice-0.10.12-destdir.patch
@@ -0,0 +1,61 @@
+diff -up goffice-0.10.12/mmlitex/Makefile.am.destdir goffice-0.10.12/mmlitex/Makefile.am
+--- goffice-0.10.12/mmlitex/Makefile.am.destdir	2014-02-23 23:55:00.000000000 +0100
++++ goffice-0.10.12/mmlitex/Makefile.am	2014-03-04 21:21:12.603827954 +0100
+@@ -7,6 +7,6 @@ xslt_DATA = \
+ 	mmlitex.xsl	\
+ 	tables.xsl \
+ 	README 
+-xsltdir = $(DESTDIR)$(goffice_datadir)/mmlitex
++xsltdir = $(goffice_datadir)/mmlitex
+ 
+ EXTRA_DIST = $(xslt_DATA)
+diff -up goffice-0.10.12/mmlitex/Makefile.in.destdir goffice-0.10.12/mmlitex/Makefile.in
+--- goffice-0.10.12/mmlitex/Makefile.in.destdir	2014-03-04 00:43:14.000000000 +0100
++++ goffice-0.10.12/mmlitex/Makefile.in	2014-03-04 21:21:12.604827963 +0100
+@@ -136,7 +136,7 @@ am__uninstall_files_from_dir = { \
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(xsltdir)"
++am__installdirs = "$(xsltdir)"
+ DATA = $(xslt_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -398,23 +398,23 @@ install-xsltDATA: $(xslt_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	@list='$(xslt_DATA)'; test -n "$(xsltdir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(xsltdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(xsltdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(xsltdir)'"; \
++	  $(MKDIR_P) "$(xsltdir)" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsltdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xsltdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(xsltdir)'"; \
++	  $(INSTALL_DATA) $$files "$(xsltdir)" || exit $$?; \
+ 	done
+ 
+ uninstall-xsltDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(xslt_DATA)'; test -n "$(xsltdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(xsltdir)'; $(am__uninstall_files_from_dir)
++	dir='$(xsltdir)'; $(am__uninstall_files_from_dir)
+ tags TAGS:
+ 
+ ctags CTAGS:
+@@ -456,7 +456,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(xsltdir)"; do \
++	for dir in "$(xsltdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
diff --git a/goffice.spec b/goffice.spec
index 16ed474..fdabd2c 100644
--- a/goffice.spec
+++ b/goffice.spec
@@ -5,6 +5,7 @@ Summary:        G Office support libraries
 License:        GPLv2+
 URL:            http://projects.gnome.org/gnumeric/index.shtml
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.10/%{name}-%{version}.tar.xz
+Patch0:         %{name}-%{version}-destdir.patch
 BuildRequires:  gtk3-devel
 BuildRequires:  intltool
 BuildRequires:  libgsf-devel
@@ -26,6 +27,7 @@ Development libraries for goffice
 
 %prep
 %setup -q
+%patch0 -p1 -b .destdir
 
 
 %build
@@ -65,6 +67,7 @@ rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version}/plugins/*/*.la
 - Updated to 0.10.12
 - Added libxslt-devel to BuildRequires
 - Added %%{_datadir}/goffice to %%files
+- Patched the bogus DESTDIR out
 
 * Wed Feb 19 2014 Julian Sikorski <belegdol at fedoraproject.org> - 0.10.11-1
 - Updated to 0.10.11


More information about the scm-commits mailing list