diff options
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | tor.spec.in | 14 |
2 files changed, 22 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index bcb3f22252..1e1013e6dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,16 +11,18 @@ EXTRA_DIST = INSTALL README AUTHORS LICENSE ChangeLog tor.spec tor.spec.in # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor dist-rpm: dist - rm -rf /tmp/tor-rpm-build - mkdir /tmp/tor-rpm-build - for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \ - mkdir /tmp/tor-rpm-build/$$subdir; \ - done - cp tor-$(VERSION).tar.gz /tmp/tor-rpm-build/SOURCES - rpmbuild -ba --define '_topdir /tmp/tor-rpm-build' tor.spec - mv /tmp/tor-rpm-build/SRPMS/* . - mv /tmp/tor-rpm-build/RPMS/*/* . - rm -rf /tmp/tor-rpm-build + RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$"; \ + rm -rf $$RPM_BUILD_DIR; \ + mkdir $$RPM_BUILD_DIR || exit 1; \ + for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \ + mkdir $$RPM_BUILD_DIR/$$subdir; \ + done; \ + cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES; \ + rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" \ + $$RPMBUILD_OPTIONS tor.spec; \ + mv $$RPM_BUILD_DIR/SRPMS/* .; \ + mv $$RPM_BUILD_DIR/RPMS/*/* .; \ + rm -rf $$RPM_BUILD_DIR doxygen: doxygen && cd doc/doxygen/latex && make diff --git a/tor.spec.in b/tor.spec.in index 9c4dcc8243..2499510a2f 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -6,7 +6,7 @@ # This should be incremented whenever the spec file changes, but # can drop back to zero at a new Tor version -%define specver 0 +%define specver 1 ## Things users may want to change # @@ -58,12 +58,18 @@ %define ostag suse %endif + # Using the build date ensures that every build really does get -# a different release number. -%define blddate %(date -u +"%Y%m%d%H%M") +# a different release number. We use this trick for CVS versions. +# For release versions, we don't want or need it. +%define is_cvs_version %(echo %{native_version} | grep 'cvs' > /dev/null && echo 1 || echo 0) -# ... and here it is. +%if %{is_cvs_version} +%define blddate %(date -u +"%Y%m%d%H%M") %define release %{pkgspec}.%{specver}.%{ostag}.%{blddate} +%else +%define release %{pkgspec}.%{specver}.%{ostag} +%endif ## General-purpose macros # |