diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-12-18 23:04:55 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-12-18 23:04:55 +0000 |
| commit | 0e9f77b9d8a150953cacc086b89d7884715d1366 (patch) | |
| tree | 2a306fa4472018a600f41d5bbbf17b5d1e20e610 /tor.spec.in | |
| parent | c1ccb63a37596ecafc604f5062f80cd881e899ff (diff) | |
| download | tor-0e9f77b9d8a150953cacc086b89d7884715d1366.tar.gz tor-0e9f77b9d8a150953cacc086b89d7884715d1366.zip | |
Forward-port last RPM change to mainline
svn:r3178
Diffstat (limited to 'tor.spec.in')
| -rw-r--r-- | tor.spec.in | 14 |
1 files changed, 10 insertions, 4 deletions
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 # |