diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2008-12-04 22:07:38 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2008-12-04 22:07:38 +0000 |
commit | 2336970eca34115aa66c990a35f41d8ba879ce76 (patch) | |
tree | 18705d6f80cbf09391838d9f34b30684a65623aa /pki | |
parent | 53d4f9675e826c795d6ecd56f758c618c2d14700 (diff) | |
download | pki-2336970eca34115aa66c990a35f41d8ba879ce76.tar.gz pki-2336970eca34115aa66c990a35f41d8ba879ce76.tar.xz pki-2336970eca34115aa66c990a35f41d8ba879ce76.zip |
Fixed Bugzilla Bug #474639 - Removed NSS dependency on "pkcs11-devel" and
upgraded NSS/NSPR version dependencies.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@162 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
-rw-r--r-- | pki/dogtag/native-tools/pki-native-tools.spec | 9 | ||||
-rw-r--r-- | pki/dogtag/osutil/osutil.spec | 9 | ||||
-rwxr-xr-x | pki/dogtag/scripts/prepare_ca | 3 | ||||
-rwxr-xr-x | pki/dogtag/scripts/prepare_pki | 3 | ||||
-rw-r--r-- | pki/dogtag/symkey/symkey.spec | 9 | ||||
-rw-r--r-- | pki/dogtag/tps/pki-tps.spec | 7 |
6 files changed, 25 insertions, 15 deletions
diff --git a/pki/dogtag/native-tools/pki-native-tools.spec b/pki/dogtag/native-tools/pki-native-tools.spec index 35cd18cbd..c8c85140b 100644 --- a/pki/dogtag/native-tools/pki-native-tools.spec +++ b/pki/dogtag/native-tools/pki-native-tools.spec @@ -33,7 +33,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 3 +%define base_release 4 %define base_group System Environment/Shells %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -131,10 +131,10 @@ BuildRoot: %{_builddir}/%{name}-root ## Technically, "ant" should not need to be in "BuildRequires" since ## it is the Java equivalent of "make" (and/or "Autotools"). ## -BuildRequires: bash >= 3.0, cyrus-sasl-devel >= 2.1.19, mozldap-devel >= 6.0.2, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5, svrcore-devel >= 4.0.3.01 +BuildRequires: bash >= 3.0, cyrus-sasl-devel >= 2.1.19, mozldap-devel >= 6.0.2, nspr-devel >= 4.6.99, nss-devel >= 3.12.0, svrcore-devel >= 4.0.3.01 ## Without Requires something, rpmbuild will abort! -Requires: mozldap-tools >= 6.0.2, nss >= 3.11.5, nss-tools >= 3.11.5 +Requires: mozldap-tools >= 6.0.2, nss >= 3.12.0, nss-tools >= 3.12.0 ## This package is non-relocatable! @@ -250,6 +250,9 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Thu Dec 4 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4 +- Bugzilla Bug #474369 - Remove NSS dependency on "pkcs11-devel" and + upgrade NSS/NSPR version dependencies * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org" diff --git a/pki/dogtag/osutil/osutil.spec b/pki/dogtag/osutil/osutil.spec index b186b19ae..c72fe0420 100644 --- a/pki/dogtag/osutil/osutil.spec +++ b/pki/dogtag/osutil/osutil.spec @@ -27,7 +27,7 @@ ## Package Header Definitions %define base_name %{base_component} %define base_version 1.0.0 -%define base_release 3 +%define base_release 4 %define base_group System Environment/Libraries %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -118,10 +118,10 @@ BuildRoot: %{_builddir}/%{name}-root ## Technically, "ant" should not need to be in "BuildRequires" since ## it is the Java equivalent of "make" (and/or "Autotools"). ## -BuildRequires: ant >= 1.6.2, bash >= 3.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5 +BuildRequires: ant >= 1.6.2, bash >= 3.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, nspr-devel >= 4.6.99, nss-devel >= 3.12.0 ## Without Requires something, rpmbuild will abort! -Requires: jpackage-utils >= 1.6.0, nspr >= 4.6.5, nss >= 3.11.5 +Requires: jpackage-utils >= 1.6.0, nss >= 3.12.0 ## This package is non-relocatable! @@ -234,6 +234,9 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Thu Dec 4 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4 +- Bugzilla Bug #474369 - Remove NSS dependency on "pkcs11-devel" and + upgrade NSS/NSPR version dependencies * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org" diff --git a/pki/dogtag/scripts/prepare_ca b/pki/dogtag/scripts/prepare_ca index 98ebafc9e..b3ac80323 100755 --- a/pki/dogtag/scripts/prepare_ca +++ b/pki/dogtag/scripts/prepare_ca @@ -88,7 +88,6 @@ NSPR=nspr NSPR_DEVEL=nspr-devel NSS=nss NSS_DEVEL=nss-devel -NSS_PKCS11_DEVEL=nss-pkcs11-devel NSS_TOOLS=nss-tools JSS=jss SVRCORE=svrcore @@ -149,5 +148,5 @@ TOMCAT5=tomcat5 TOMCATJSS=tomcatjss # Build and install PKI support packages -${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_PKCS11_DEVEL} ${NSS_TOOLS} ${JSS} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} +${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} diff --git a/pki/dogtag/scripts/prepare_pki b/pki/dogtag/scripts/prepare_pki index f11b7363f..74ff7d2c2 100755 --- a/pki/dogtag/scripts/prepare_pki +++ b/pki/dogtag/scripts/prepare_pki @@ -88,7 +88,6 @@ NSPR=nspr NSPR_DEVEL=nspr-devel NSS=nss NSS_DEVEL=nss-devel -NSS_PKCS11_DEVEL=nss-pkcs11-devel NSS_TOOLS=nss-tools JSS=jss SVRCORE=svrcore @@ -181,5 +180,5 @@ APR_UTIL_DEVEL=apr-util-devel HTTPD_DEVEL=httpd-devel # Build and install PKI support packages -${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_PKCS11_DEVEL} ${NSS_TOOLS} ${JSS} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${APR} ${PCRE} ${EXPAT} ${APR_UTIL} ${HTTPD} ${MOD_NSS} ${MOD_PERL} ${MOD_REVOCATOR} ${PERL_PARSE_RECDESCENT} ${PERL_HTML_TAGSET} ${PERL_HTML_PARSER} ${PERL_URI} ${PERL_LIBWWW_PERL} ${PERL_XML_PARSER} ${PERL_XML_SIMPLE} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_SAX} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${READLINE} ${READLINE_DEVEL} ${NCURSES} ${NCURSES_DEVEL} ${TCL} ${TCL_DEVEL} ${SQLITE} ${SQLITE_DEVEL} ${PERL_DBI} ${PERL_DBD_SQLITE} ${PCRE_DEVEL} ${EXPAT_DEVEL} ${APR_DEVEL} ${APR_UTIL_DEVEL} ${HTTPD_DEVEL} +${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${APR} ${PCRE} ${EXPAT} ${APR_UTIL} ${HTTPD} ${MOD_NSS} ${MOD_PERL} ${MOD_REVOCATOR} ${PERL_PARSE_RECDESCENT} ${PERL_HTML_TAGSET} ${PERL_HTML_PARSER} ${PERL_URI} ${PERL_LIBWWW_PERL} ${PERL_XML_PARSER} ${PERL_XML_SIMPLE} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_SAX} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${READLINE} ${READLINE_DEVEL} ${NCURSES} ${NCURSES_DEVEL} ${TCL} ${TCL_DEVEL} ${SQLITE} ${SQLITE_DEVEL} ${PERL_DBI} ${PERL_DBD_SQLITE} ${PCRE_DEVEL} ${EXPAT_DEVEL} ${APR_DEVEL} ${APR_UTIL_DEVEL} ${HTTPD_DEVEL} diff --git a/pki/dogtag/symkey/symkey.spec b/pki/dogtag/symkey/symkey.spec index 575c46923..f452db464 100644 --- a/pki/dogtag/symkey/symkey.spec +++ b/pki/dogtag/symkey/symkey.spec @@ -27,7 +27,7 @@ ## Package Header Definitions %define base_name %{base_component} %define base_version 1.0.0 -%define base_release 3 +%define base_release 4 %define base_group System Environment/Libraries %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -118,10 +118,10 @@ BuildRoot: %{_builddir}/%{name}-root ## Technically, "ant" should not need to be in "BuildRequires" since ## it is the Java equivalent of "make" (and/or "Autotools"). ## -BuildRequires: ant >= 1.6.2, bash >= 3.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5 +BuildRequires: ant >= 1.6.2, bash >= 3.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4, nspr-devel >= 4.6.99, nss-devel >= 3.12.0 ## Without Requires something, rpmbuild will abort! -Requires: jpackage-utils >= 1.6.0, jss >= 4.2.4, nspr >= 4.6.5, nss >= 3.11.5 +Requires: jpackage-utils >= 1.6.0, jss >= 4.2.4, nss >= 3.12.0 ## This package is non-relocatable! @@ -234,6 +234,9 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Thu Dec 4 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4 +- Bugzilla Bug #474369 - Remove NSS dependency on "pkcs11-devel" and + upgrade NSS/NSPR version dependencies * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org" diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec index fe5807ff4..e46d3b640 100644 --- a/pki/dogtag/tps/pki-tps.spec +++ b/pki/dogtag/tps/pki-tps.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 7 +%define base_release 8 %define base_group System Environment/Daemons %define base_vendor Red Hat, Inc. %define base_license LGPLv2 with exceptions @@ -138,7 +138,7 @@ BuildRoot: %{_builddir}/%{name}-root ## Technically, "ant" should not need to be in "BuildRequires" since ## it is the Java equivalent of "make" (and/or "Autotools"). ## -BuildRequires: apr-devel >= 0.9.4, apr-util-devel >= 0.9.4, %{base_flavor}-%{base_name}-ui >= 1.0.0, bash >= 3.0, cyrus-sasl-devel >= 2.1.19, httpd-devel >= 2.0.52, mozldap-devel >= 6.0.2, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5, pcre-devel >= 6.6, svrcore-devel >= 4.0.3.01, zlib >= 1.2.3 +BuildRequires: apr-devel >= 0.9.4, apr-util-devel >= 0.9.4, %{base_flavor}-%{base_name}-ui >= 1.0.0, bash >= 3.0, cyrus-sasl-devel >= 2.1.19, httpd-devel >= 2.0.52, mozldap-devel >= 6.0.2, nspr-devel >= 4.6.99, nss-devel >= 3.12.0, pcre-devel >= 6.6, svrcore-devel >= 4.0.3.01, zlib >= 1.2.3 ## Without Requires something, rpmbuild will abort! Requires: %{base_prefix}-setup >= 1.0.0, %{base_name}-ui, mod_nss >= 1.0.3, mod_perl >= 1.99_16, mozldap >= 6.0.2, perl-HTML-Parser >= 3.35, perl-HTML-Tagset >= 3.03, perl-Parse-RecDescent >= 1.94, perl-URI >= 1.30, perl-XML-NamespaceSupport >= 1.08, perl-XML-Parser >= 2.34, perl-XML-SAX >= 0.12, perl-XML-Simple >= 2.14, perl-libwww-perl >= 5.79 @@ -293,6 +293,9 @@ fi ############################################################################### %changelog +* Thu Dec 4 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-8 +- Bugzilla Bug #474369 - Remove NSS dependency on "pkcs11-devel" and + upgrade NSS/NSPR version dependencies * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-7 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org" |