[389-commits] [lib389] 02/02: Ticket 19 - Missing file and improve make

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch master
in repository lib389.

commit cc6e81080af6cbc58fe6e7fa2a5cd0c89da53fe1
Author: William Brown <firstyear@redhat.com>
Date: Thu Apr 6 15:04:03 2017 +1000

Ticket 19 - Missing file and improve make

Bug Description: This fixes a missing file in the RPM specfile.
This also makes the local makefile better for docker containers.

Fix Description: Fix the renamed README line in spec, and improve
the topdir in rpmbuild

https://pagure.io/lib389/issue/19

Author: wibrown

Review by: vashirov (Thanks!)
---
Makefile | 12 ++++++------
python-lib389.spec | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e6a577d..5e4332c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@

LIB389_VERS ?= $(shell cat ./VERSION | head -n 1)
PYTHON ?= /usr/bin/python
+RPMBUILD ?= $(shell pwd)/rpmbuild

all: build

@@ -13,17 +14,16 @@ install:

rpmbuild-prep:
mkdir -p ./dist/
- mkdir -p ~/rpmbuild/SOURCES
- mkdir -p ~/rpmbuild/SPECS
+ mkdir -p $(RPMBUILD)/SOURCES
+ mkdir -p $(RPMBUILD)/SPECS
git archive --prefix=python-lib389-$(LIB389_VERS)-1/ HEAD | bzip2 > ./dist/python-lib389-$(LIB389_VERS)-1.tar.bz2
- cp ./dist/python-lib389-$(LIB389_VERS)-1.tar.bz2 ~/rpmbuild/SOURCES/
+ cp ./dist/python-lib389-$(LIB389_VERS)-1.tar.bz2 $(RPMBUILD)/SOURCES/

srpm: rpmbuild-prep
- rpmbuild -bs python-lib389.spec
- cp ~/rpmbuild/SRPMS/python-lib389*.src.rpm ./dist/
+ rpmbuild --define "_topdir $(RPMBUILD)" -bs python-lib389.spec

rpm: rpmbuild-prep
- rpmbuild -bb python-lib389.spec
+ rpmbuild --define "_topdir $(RPMBUILD)" -bb python-lib389.spec

pep8:
pep8 --max-line-length=160 ./lib389
diff --git a/python-lib389.spec b/python-lib389.spec
index 95a300b..68394ad 100644
--- a/python-lib389.spec
+++ b/python-lib389.spec
@@ -93,7 +93,7 @@ and configuring the 389 Directory Server.

%files -n python2-%{srcname}
%license LICENSE
-%doc README
+%doc README.md
%{python2_sitelib}/*
%if 0%{?rhel} >= 8 || 0%{?fedora}
%exclude %{_sbindir}/*

--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org