From 02c4a39865b4c4ccaf87bd79a111e928c28a9a5e Mon Sep 17 00:00:00 2001 From: James Laska Date: Wed, 23 Apr 2014 13:52:08 -0400 Subject: [PATCH] Add SELinux module to allow socket.io This also makes several smaller style/format changes to the .spec file. --- Makefile | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index f30136499c..14ecab4603 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,7 @@ release_clean: -(rm *.tar) -(rm -rf ($RELEASE)) -sdist: clean minjs +sdist: clean if [ "$(OFFICIAL)" = "yes" ] ; then \ $(PYTHON) setup.py release_build; \ else \ @@ -206,24 +206,38 @@ sdist: clean minjs fi rpmtar: sdist + mkdir -p rpm-build + cp packaging/rpm/$(NAME).te rpm-build/ if [ "$(OFFICIAL)" != "yes" ] ; then \ (cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \ (cd dist/ && mv $(NAME)-$(VERSION)-$(BUILD) $(NAME)-$(VERSION)) ; \ (cd dist/ && tar czf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)) ; \ fi + cp dist/$(NAME)-$(VERSION).tar.gz rpm-build/ + +srpm: rpmtar + @rpmbuild \ + --define "_pkgrelease $(RPM_PKG_RELEASE)" \ + --define "_topdir %(pwd)/rpm-build" \ + --define "_builddir %{_topdir}" \ + --define "_rpmdir %{_topdir}" \ + --define "_srcrpmdir %{_topdir}" \ + --define "_specdir %{_topdir}" \ + --define "_sourcedir %{_topdir}" \ + --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \ + -bs packaging/rpm/$(NAME).spec rpm: rpmtar - @mkdir -p rpm-build - @cp dist/$(NAME)-$(VERSION).tar.gz rpm-build/ - @rpmbuild --define "_topdir %(pwd)/rpm-build" \ - --define "_builddir %{_topdir}" \ - --define "_rpmdir %{_topdir}" \ - --define "_srcrpmdir %{_topdir}" \ - --define "_specdir %{_topdir}" \ - --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \ - --define "_sourcedir %{_topdir}" \ - --define "_pkgrelease $(RPM_PKG_RELEASE)" \ - -ba packaging/rpm/$(NAME).spec + @rpmbuild \ + --define "_pkgrelease $(RPM_PKG_RELEASE)" \ + --define "_topdir %(pwd)/rpm-build" \ + --define "_builddir %{_topdir}" \ + --define "_rpmdir %{_topdir}" \ + --define "_srcrpmdir %{_topdir}" \ + --define "_specdir %{_topdir}" \ + --define "_sourcedir %{_topdir}" \ + --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \ + -ba packaging/rpm/$(NAME).spec deb: sdist @mkdir -p deb-build