summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskvidal <skvidal>2005-06-27 03:43:11 +0000
committerskvidal <skvidal>2005-06-27 03:43:11 +0000
commit621db8f69620eee39ad1b400a1a2cfb581f5a4c0 (patch)
tree1e51e4bb0a783fe514dc0b8d865a9cb6142b6300
parent27476d0782d01c3adbb28eb092727f836ca100a9 (diff)
downloadmock-621db8f69620eee39ad1b400a1a2cfb581f5a4c0.tar.gz
mock-621db8f69620eee39ad1b400a1a2cfb581f5a4c0.tar.xz
mock-621db8f69620eee39ad1b400a1a2cfb581f5a4c0.zip
apply ignacio's patch for Makefile and spec file.
-rw-r--r--Makefile10
-rw-r--r--mock.spec2
2 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bbc3b02..9130a78 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,10 @@ clean:
rm -f *.pyc *.pyo *~ *.bak
for d in $(SUBDIRS); do make -C $$d clean ; done
+distclean: clean
+ rm -rf dist build
+ rm *.tar.gz
+
subdirs:
for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done
@@ -24,9 +28,13 @@ archive:
@rm -rf ${PKGNAME}-%{VERSION}.tar.gz
@rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME}
@dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME}
- @rm -f /tmp/${PKGNAME}/${PKGNAME}-daily.spec
+ @rm -rf /tmp/${PKGNAME}/${PKGNAME}-daily.spec /tmp/${PKGNAME}/build /tmp/${PKGNAME}/dist
@mv /tmp/${PKGNAME} /tmp/${PKGNAME}-$(VERSION)
@dir=$$PWD; cd /tmp; tar cvzf $$dir/${PKGNAME}-$(VERSION).tar.gz ${PKGNAME}-$(VERSION)
@rm -rf /tmp/${PKGNAME}-$(VERSION)
@echo "The archive is in ${PKGNAME}-$(VERSION).tar.gz"
+rpm: archive
+ rm -rf build dist
+ mkdir build dist
+ rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba mock.spec
diff --git a/mock.spec b/mock.spec
index 0e4fc49..472aac1 100644
--- a/mock.spec
+++ b/mock.spec
@@ -9,6 +9,7 @@ URL: http://linux.duke.edu/~skvidal/mock/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: python, yum >= 2.2.1
Requires(pre): shadow-utils
+BuildRequires: libselinux-devel
%description
@@ -47,6 +48,7 @@ fi
%{_bindir}/%{name}
%attr(04750, root, mock) %{_sbindir}/mock-helper
%attr(02775, root, mock) %dir /var/lib/mock
+%{_libdir}/libselinux-mock.so
%changelog