nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forward-port last RPM change to mainline

Browse Source 
svn:r3178
This commit is contained in:
Nick Mathewson 2004-12-18 23:04:55 +00:00
parent c1ccb63a37
commit 0e9f77b9d8
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.am
View File

@ -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

16
tor.spec.in
View File

@ -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")
# ... and here it is.
# Using the build date ensures that every build really does get
# 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)
%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
#