Skip to content

Commit 30ece31

Browse files
FreddieAkeroydFreddie Akeroyd
authored and
Freddie Akeroyd
committed
Fix rpm naming on tag. Refs nexusformat#341
git-svn-id: https://svn.nexusformat.org/code/trunk@1888 ff5d1e40-2be0-497f-93bd-dc18237bd3c7
1 parent b2cfde5 commit 30ece31

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

nexus_spec.in

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ Version: @NEXUS_VERSION@
99
# Release is the number of times this version of the software was
1010
# built into an RPM file; it should be incremented each RPM build and
1111
# then reset to 1 when a new version of the software is released
12-
Release: @PACKAGE_RELEASE@.@NEXUS_RELEASE@%{?dist}
12+
%if "@NEXUS_RELEASE@" == ""
13+
%else
14+
%define nexusrelease .@NEXUS_RELEASE@
15+
%endif
16+
Release: @PACKAGE_RELEASE@%{?nexusrelease}%{?dist}
1317
License: LGPL
1418
# Group: there is more than one choice for this - maybe we need to split
1519
# nexus into separate packages (libraries + apps)
@@ -52,7 +56,7 @@ BuildRoot: %{_tmppath}/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
5256
BuildRequires: python numpy
5357
BuildRequires: hdf5-devel hdf-devel
5458
BuildRequires: libxml2-devel
55-
BuildRequires: java-1.6.0-openjdk-devel
59+
#BuildRequires: java-1.6.0-openjdk-devel
5660
BuildRequires: readline-devel
5761
# mxml is not in rhel or epel as yet
5862
# ant on rhel5 is too old to build NXvalidate

0 commit comments

Comments
 (0)