From f5beb6b31ad055d1c41521f8bf36ad31a23d404ce94d2b59b2af01d14417b362 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 May 2016 07:28:52 +0000 Subject: [PATCH] Accepting request 393463 from home:StefanBruens:branches:devel:openSUSE:Factory:rpmlint_2 Pyo files contained full source path including $DESTDIR, i.e. %{buildroot} Triggered rebuild, all files are now identical OBS-URL: https://build.opensuse.org/request/show/393463 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=384 --- omit_BUILDROOT_from_pyo_files.patch | 14 ++++++++++++++ rpmlint.changes | 5 +++++ rpmlint.spec | 1 + 3 files changed, 20 insertions(+) create mode 100644 omit_BUILDROOT_from_pyo_files.patch diff --git a/omit_BUILDROOT_from_pyo_files.patch b/omit_BUILDROOT_from_pyo_files.patch new file mode 100644 index 0000000..b861e2e --- /dev/null +++ b/omit_BUILDROOT_from_pyo_files.patch @@ -0,0 +1,14 @@ +diff -u rpmlint-rpmlint-1.8.orig/Makefile rpmlint-rpmlint-1.8/Makefile +--- rpmlint-rpmlint-1.8.orig/Makefile 2016-05-03 18:21:47.823504438 +0200 ++++ rpmlint-rpmlint-1.8/Makefile 2016-05-03 18:25:11.746636047 +0200 +@@ -39,9 +39,7 @@ + $(DESTDIR)$(LIBDIR)/[A-Z]*.py \ + $(DESTDIR)$(LIBDIR)/__*__.py ; \ + fi +- $(PYTHON) -O -m py_compile \ +- $(DESTDIR)$(LIBDIR)/[A-Z]*.py \ +- $(DESTDIR)$(LIBDIR)/__*__.py ; \ ++ $(PYTHON) -O -m compileall -d $(LIBDIR) $(DESTDIR)$(LIBDIR) + for file in rpmlint rpmdiff ; do \ + sed -e "s,#!/usr/bin/python ,#!$(PYTHON) ," $$file > $(DESTDIR)$(BINDIR)/$$file ; \ + chmod +x $(DESTDIR)$(BINDIR)/$$file ; \ diff --git a/rpmlint.changes b/rpmlint.changes index 86f3b38..c50b917 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 3 16:33:33 UTC 2016 - stefan.bruens@rwth-aachen.de + +- add omit_BUILDROOT_from_pyo_files.patch (boo#978306) + ------------------------------------------------------------------- Wed Apr 6 09:31:04 UTC 2016 - dmueller@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 58f6b34..6420bd7 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -113,6 +113,7 @@ Patch61: postin-speedup.diff # https://github.com/rpm-software-management/rpmlint/commit/37fe9d4f237c2cb29fcb3b60d1ece189e578eeaf.patch and followup regression fixes Patch62: binaryinfo-speedup.diff Patch63: 0001-Avoid-messing-with-the-error-encoding-Fixes-61.patch +Patch64: omit_BUILDROOT_from_pyo_files.patch # PATCHLIST END # BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766 BuildArch: noarch