diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-01-23 06:53:34 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-01-23 06:53:34 +0000 |
commit | dce178a33eb073914c4fe3ca032233c48dd1ae4e (patch) | |
tree | dc4aab330bce4d3777909aa670c79598f641bd90 | |
parent | 073b84b00cc3cf43b023cb9188e6c2c0e94b1ef0 (diff) | |
download | pki-dce178a33eb073914c4fe3ca032233c48dd1ae4e.tar.gz pki-dce178a33eb073914c4fe3ca032233c48dd1ae4e.tar.xz pki-dce178a33eb073914c4fe3ca032233c48dd1ae4e.zip |
Bugzilla Bug #557638 - Rename 'symkey' package to 'pki-symkey' package.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@938 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r-- | pki/dogtag/common/pki-common.spec | 9 | ||||
-rw-r--r-- | pki/dogtag/manage/pki-manage.spec | 5 | ||||
-rwxr-xr-x | pki/dogtag/scripts/build_ca | 6 | ||||
-rwxr-xr-x | pki/dogtag/scripts/build_pki | 6 | ||||
-rwxr-xr-x | pki/dogtag/scripts/remove_pki_components | 2 | ||||
-rwxr-xr-x | pki/dogtag/symkey/build_dogtag | 6 | ||||
-rw-r--r-- | pki/dogtag/symkey/pki-symkey.spec (renamed from pki/dogtag/symkey/symkey.spec) | 24 |
7 files changed, 36 insertions, 22 deletions
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec index f0eac695..a47d1d83 100644 --- a/pki/dogtag/common/pki-common.spec +++ b/pki/dogtag/common/pki-common.spec @@ -1,6 +1,6 @@ Name: pki-common Version: 1.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Dogtag Certificate System - PKI Common Framework URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -16,8 +16,8 @@ BuildRequires: jpackage-utils BuildRequires: jss >= 4.2.6 BuildRequires: ldapjdk BuildRequires: osutil +BuildRequires: pki-symkey BuildRequires: pki-util -BuildRequires: symkey BuildRequires: velocity BuildRequires: xalan-j2 Buildrequires: xerces-j2 @@ -28,7 +28,7 @@ Requires: osutil Requires: pki-common-ui Requires: pki-java-tools Requires: pki-setup -Requires: symkey +Requires: pki-symkey Requires: tomcatjss Requires: %{_javadir}/ldapjdk.jar Requires: %{_javadir}/velocity.jar @@ -110,6 +110,9 @@ rm -rf %{buildroot} %{_javadocdir}/%{name}-%{version}/ %changelog +* Thu Jan 21 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-9 +- Bugzilla Bug #557638 - Rename 'symkey' package to 'pki-symkey' package + * Fri Jan 15 2010 Kevin Wright <kwright@redhat.com> 1.3.0-8 - Removed Requires: rhgb diff --git a/pki/dogtag/manage/pki-manage.spec b/pki/dogtag/manage/pki-manage.spec index 6d6de24e..e7ad97b9 100644 --- a/pki/dogtag/manage/pki-manage.spec +++ b/pki/dogtag/manage/pki-manage.spec @@ -1,6 +1,6 @@ Name: pki-manage Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dogtag Certificate System - PKI Uninstall Scripts URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -55,6 +55,9 @@ rm -rf %{buildroot} %{_bindir}/* %changelog +* Thu Jan 21 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3 +- Bugzilla Bug #557638 - Rename 'symkey' package to 'pki-symkey' package + * Mon Dec 14 2009 Kevin Wright <kwright@redhat.com> 1.3.0-2 - Removed 'with exceptions' from License diff --git a/pki/dogtag/scripts/build_ca b/pki/dogtag/scripts/build_ca index 2505dd12..ceb4fb6d 100755 --- a/pki/dogtag/scripts/build_ca +++ b/pki/dogtag/scripts/build_ca @@ -92,7 +92,7 @@ PKI_RELEASE_UI_DIR="${PKI_RELEASE_ROOT}/${PKI_UI_DIR}" # Establish common PKI package names OSUTIL=osutil${RPM_EXT} -SYMKEY=symkey${RPM_EXT} +PKI_SYMKEY=pki-symkey${RPM_EXT} PKI_NATIVE_TOOLS=pki-native-tools${RPM_EXT} PKI_UTIL=pki-util${RPM_EXT} PKI_UTIL_JAVADOC=pki-util-javadoc${RPM_EXT} @@ -121,9 +121,9 @@ mkdir -p ${PKI_RELEASE_ROOT} ${PKI_BUILD_SCRIPT_DIR}/osutil/${PKI_BUILD_SCRIPT} ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/osutil/${RPM_DIR}/${OSUTIL} -# Build and install 'symkey' packages +# Build and install 'pki-symkey' packages ${PKI_BUILD_SCRIPT_DIR}/symkey/${PKI_BUILD_SCRIPT} -${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/symkey/${RPM_DIR}/${SYMKEY} +${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/symkey/${RPM_DIR}/${PKI_SYMKEY} # Build and install 'pki-native-tools' packages ${PKI_BUILD_SCRIPT_DIR}/native-tools/${PKI_BUILD_SCRIPT} diff --git a/pki/dogtag/scripts/build_pki b/pki/dogtag/scripts/build_pki index 7d9a25c3..74a48df2 100755 --- a/pki/dogtag/scripts/build_pki +++ b/pki/dogtag/scripts/build_pki @@ -92,7 +92,7 @@ PKI_RELEASE_UI_DIR="${PKI_RELEASE_ROOT}/${PKI_UI_DIR}" # Establish common PKI package names OSUTIL=osutil${RPM_EXT} -SYMKEY=symkey${RPM_EXT} +PKI_SYMKEY=pki-symkey${RPM_EXT} PKI_NATIVE_TOOLS=pki-native-tools${RPM_EXT} PKI_UTIL=pki-util${RPM_EXT} PKI_UTIL_JAVADOC=pki-util-javadoc${RPM_EXT} @@ -133,9 +133,9 @@ mkdir -p ${PKI_RELEASE_ROOT} ${PKI_BUILD_SCRIPT_DIR}/osutil/${PKI_BUILD_SCRIPT} ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/osutil/${RPM_DIR}/${OSUTIL} -# Build and install 'symkey' packages +# Build and install 'pki-symkey' packages ${PKI_BUILD_SCRIPT_DIR}/symkey/${PKI_BUILD_SCRIPT} -${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/symkey/${RPM_DIR}/${SYMKEY} +${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/symkey/${RPM_DIR}/${PKI_SYMKEY} # Build and install 'pki-native-tools' packages ${PKI_BUILD_SCRIPT_DIR}/native-tools/${PKI_BUILD_SCRIPT} diff --git a/pki/dogtag/scripts/remove_pki_components b/pki/dogtag/scripts/remove_pki_components index c87ed0c7..80569749 100755 --- a/pki/dogtag/scripts/remove_pki_components +++ b/pki/dogtag/scripts/remove_pki_components @@ -115,7 +115,7 @@ printf "Processing PKI components present on system . . . " PKI_COMPONENTS="${PKI_COMPONENTS} osutil" fi - # (3) check for symkey + # (3) check for symkey (legacy package) `rpm -q --quiet symkey` SYMKEY_PRESENCE=$? if [ "${SYMKEY_PRESENCE}" = "0" ] ; then diff --git a/pki/dogtag/symkey/build_dogtag b/pki/dogtag/symkey/build_dogtag index e7a70151..34c50e47 100755 --- a/pki/dogtag/symkey/build_dogtag +++ b/pki/dogtag/symkey/build_dogtag @@ -30,7 +30,7 @@ DOGTAG_BUILD_SCRIPT=`basename $0` export DOGTAG_BUILD_SCRIPT DOGTAG_COMPONENT=`basename ${PWD}` export DOGTAG_COMPONENT -DOGTAG_SPECFILE="symkey.spec" +DOGTAG_SPECFILE="pki-symkey.spec" export DOGTAG_SPECFILE # Set PKI 'ant' environment variables (originally obtained from specfile) @@ -38,9 +38,9 @@ PKI_PRODUCT_UI_FLAVOR_PREFIX="" export PKI_PRODUCT_UI_FLAVOR_PREFIX PKI_PRODUCT_PREFIX="" export PKI_PRODUCT_PREFIX -PKI_PRODUCT="symkey" +PKI_PRODUCT="pki-symkey" export PKI_PRODUCT -PKI_VERSION="1.3.1" +PKI_VERSION="1.3.2" export PKI_VERSION # Set Dogtag helper variables diff --git a/pki/dogtag/symkey/symkey.spec b/pki/dogtag/symkey/pki-symkey.spec index 3b02ad2f..b5bcaa44 100644 --- a/pki/dogtag/symkey/symkey.spec +++ b/pki/dogtag/symkey/pki-symkey.spec @@ -1,5 +1,5 @@ -Name: symkey -Version: 1.3.1 +Name: pki-symkey +Version: 1.3.2 Release: 1%{?dist} Summary: Symmetric Key JNI Package URL: http://pki.fedoraproject.org/ @@ -21,6 +21,10 @@ Requires: jpackage-utils Requires: jss >= 4.2.6 Requires: nss >= 3.12.3.99 +Provides: symkey = %{version}-%{release} + +Obsoletes: symkey < %{version}-%{release} + Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz %description @@ -49,15 +53,15 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} ## rearrange files to be in the desired native packaging layout -mkdir -p %{buildroot}%{_libdir}/%{name}/ -mv %{buildroot}/opt/java/%{name}.jar %{buildroot}%{_libdir}/%{name}/%{name}-%{version}.jar -mv %{buildroot}%{_libdir}/lib%{name}.so %{buildroot}%{_libdir}/%{name}/lib%{name}.so +mkdir -p %{buildroot}%{_libdir}/symkey/ +mv %{buildroot}/opt/java/symkey.jar %{buildroot}%{_libdir}/symkey/symkey-%{version}.jar +mv %{buildroot}%{_libdir}/libsymkey.so %{buildroot}%{_libdir}/symkey/libsymkey.so mkdir -p %{buildroot}%{_jnidir}/ -cd %{buildroot}%{_jnidir} ; ln -s %{_libdir}/%{name}/%{name}-%{version}.jar %{name}.jar +cd %{buildroot}%{_jnidir} ; ln -s %{_libdir}/symkey/symkey-%{version}.jar symkey.jar ## remove unwanted files rm -rf %{buildroot}/opt -rm -rf %{buildroot}%{_libdir}/lib%{name}.la +rm -rf %{buildroot}%{_libdir}/libsymkey.la %clean rm -rf %{buildroot} @@ -66,9 +70,13 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_jnidir}/* -%{_libdir}/%{name}/ +%{_libdir}/symkey/ %changelog +* Thu Jan 21 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.2-1 +- Bugzilla Bug #557638 - Rename 'symkey' package to 'pki-symkey' package +- Bugzilla Bug #557632 - Re-Review Request: pki-symkey - rename from symkey + * Mon Dec 14 2009 Kevin Wright <kwright@redhat.com> 1.3.1-1 - Removed BuildRequires bash - Removed 'with exceptions' from License |