Skip to content

Commit

Permalink
Updated version number to 4.5.0-0.4 (alpha 4)
Browse files Browse the repository at this point in the history
The build script and spec template have been modified to remove
ldapjdk dependency.
  • Loading branch information
edewata committed Jul 20, 2018
1 parent e4cae03 commit b6ba4d2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 0 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
<classpathentry kind="lib" path="/usr/share/java/slf4j/slf4j-api.jar"/>
<classpathentry kind="lib" path="/usr/share/java/commons-lang.jar"/>
<classpathentry kind="lib" path="/usr/share/java/commons-codec.jar"/>
<classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 1 addition & 1 deletion build_java.pl
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ sub setup_vars {
} else {
$jarFiles = "/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/commons-codec.jar";
}
$classpath = "-classpath $jarFiles:/usr/share/java/commons-lang.jar:/usr/share/java/ldapjdk.jar:";
$classpath = "-classpath $jarFiles:/usr/share/java/commons-lang.jar";
if( $jce_jar ) {
$classpath .= ":$jce_jar";
}
Expand Down
14 changes: 8 additions & 6 deletions jss.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ URL: http://www.dogtagpki.org/wiki/JSS
License: MPLv1.1 or GPLv2+ or LGPLv2+

Version: 4.5.0
Release: 0.3%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -a3
Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -a4

# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/jss.git
Expand Down Expand Up @@ -40,12 +40,13 @@ BuildRequires: nspr-devel >= 4.13.1
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: slf4j
%if 0%{?fedora} || 0%{?rhel} > 7
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
%else
BuildRequires: slf4j-jdk14
%endif
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-codec
BuildRequires: ldapjdk

%if 0%{?fedora} >= 25 || 0%{?rhel} > 7
BuildRequires: perl-interpreter
Expand All @@ -55,12 +56,13 @@ Requires: nss >= 3.28.4-6
Requires: java-headless
Requires: jpackage-utils
Requires: slf4j
%if 0%{?fedora} || 0%{?rhel} > 7
%if 0%{?rhel} && 0%{?rhel} <= 7
# no slf4j-jdk14
%else
Requires: slf4j-jdk14
%endif
Requires: apache-commons-lang
Requires: apache-commons-codec
Requires: ldapjdk

Conflicts: idm-console-framework < 1.1.17-4
Conflicts: pki-base < 10.6.3
Expand Down

0 comments on commit b6ba4d2

Please sign in to comment.