diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-07 02:09:33 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-11-07 02:09:33 +0000 |
commit | 91c78be5e22f099eae0832d141ca231fa5e04924 (patch) | |
tree | a4bca585023efcbd495ffe4c57154f0778550fb8 /pki | |
parent | 551ac1bf0836ec7ee873be112fe2beb4fb799a5a (diff) | |
download | pki-91c78be5e22f099eae0832d141ca231fa5e04924.tar.gz pki-91c78be5e22f099eae0832d141ca231fa5e04924.tar.xz pki-91c78be5e22f099eae0832d141ca231fa5e04924.zip |
Bugzilla Bug #533233 - Remove "pki*" scripts from pki-native-tools . . .
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@813 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
-rw-r--r-- | pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec | 7 | ||||
-rw-r--r-- | pki/dogtag/ca/pki-ca.spec | 9 | ||||
-rw-r--r-- | pki/dogtag/common-ui/dogtag-pki-common-ui.spec | 7 | ||||
-rw-r--r-- | pki/dogtag/common/pki-common.spec | 12 | ||||
-rw-r--r-- | pki/dogtag/java-tools/pki-java-tools.spec | 11 | ||||
-rw-r--r-- | pki/dogtag/setup/pki-setup.spec | 7 | ||||
-rw-r--r-- | pki/dogtag/silent/pki-silent.spec | 9 | ||||
-rwxr-xr-x | pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl | 10 | ||||
-rw-r--r-- | pki/dogtag/util/pki-util.spec | 10 |
9 files changed, 54 insertions, 28 deletions
diff --git a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec index a38d7a51..9fece96e 100644 --- a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec +++ b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-ca-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Certificate Authority User Interface URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -49,8 +49,11 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/pki/* +%{_datadir}/pki/ %changelog +* Mon Nov 2 2009 Ade Lee <alee@redhat.com> 1.3.0-2 +- Bugzilla Bug #522208 - Packaging for Fedora Dogtag +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #522208 - Packaging for Fedora Dogtag diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec index abb2599c..282f103a 100644 --- a/pki/dogtag/ca/pki-ca.spec +++ b/pki/dogtag/ca/pki-ca.spec @@ -1,6 +1,6 @@ Name: pki-ca Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Dogtag Certificate System - Certificate Authority URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -97,10 +97,13 @@ fi %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki/ca/* -%{_datadir}/pki/ca/* +%{_datadir}/java/pki/ca/ +%{_datadir}/pki/ca/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4 +- Bugzilla Bug #522210 - Packaging for Fedora Dogtag +- Take ownership of directories * Tue Oct 13 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3 - Bugzilla Bug #522210 - Packaging for Fedora Dogtag * Fri Sep 18 2009 Ade Lee <alee@redhat.com> 1.3.0-2 diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec index d8473716..3943561e 100644 --- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec +++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-common-ui Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Common Framework User Interface URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -49,8 +49,11 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/pki/* +%{_datadir}/pki/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 +- Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #522204 - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec index 249831b3..e9a21b79 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: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Common Framework URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -110,15 +110,17 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki -%{_datadir}/pki/* +%{_datadir}/java/pki/ +%{_datadir}/pki/ %{_sharedstatedir}/tomcat5/common/lib/* %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%{_javadocdir}/%{name}-%{version}/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 +- Bugzilla Bug #522207 - packaging for Fedora Dogtag +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #522207 - packaging for Fedora Dogtag diff --git a/pki/dogtag/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec index b4e25d12..2150fd30 100644 --- a/pki/dogtag/java-tools/pki-java-tools.spec +++ b/pki/dogtag/java-tools/pki-java-tools.spec @@ -1,6 +1,6 @@ Name: pki-java-tools Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Java-Based Tools URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -72,14 +72,15 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_bindir}/* -%{_datadir}/java/pki -%{_datadir}/pki +%{_datadir}/java/pki/ %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%{_javadocdir}/%{name}-%{version}/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 +- Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #521995 - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/setup/pki-setup.spec b/pki/dogtag/setup/pki-setup.spec index ceeab05b..4914abb3 100644 --- a/pki/dogtag/setup/pki-setup.spec +++ b/pki/dogtag/setup/pki-setup.spec @@ -1,6 +1,6 @@ Name: pki-setup Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate system - PKI Instance Creation and Removal Scripts URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -49,8 +49,11 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_bindir}/* -%{_datadir}/pki/scripts/* +%{_datadir}/pki/scripts/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 +- Bugzilla Bug #521993 - packaging for Fedora Dogtag +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #521993 - packaging for Fedora Dogtag diff --git a/pki/dogtag/silent/pki-silent.spec b/pki/dogtag/silent/pki-silent.spec index b9143fcc..6809927e 100644 --- a/pki/dogtag/silent/pki-silent.spec +++ b/pki/dogtag/silent/pki-silent.spec @@ -1,6 +1,6 @@ Name: pki-silent Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Silent Installer URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -63,9 +63,12 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc LICENSE %{_bindir}/* -%{_datadir}/java -%{_datadir}/pki/silent/* +%{_datadir}/java/* +%{_datadir}/pki/silent/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 +- Bugzilla Bug #521996 - Packaging for Fedora Dogtag PKI +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #521996 - Packaging for Fedora Dogtag PKI diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl index 598cba3d..cb902239 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl @@ -25,15 +25,21 @@ # my $default_hardware_platform=""; my $ldapsearch=""; -$default_hardware_platform=`pkiarch`; -chomp($default_hardware_platform); if( $^O eq "linux" ) { + $default_hardware_platform=`uname -i`; + chomp($default_hardware_platform); if( $default_hardware_platform eq "i386" ) { $ldapsearch = "/usr/lib/mozldap/ldapsearch"; } elsif( $default_hardware_platform eq "x86_64" ) { $ldapsearch = "/usr/lib64/mozldap/ldapsearch"; } } elsif( $^O eq "solaris" ) { + $default_hardware_platform=`uname -p`; + chomp($default_hardware_platform); + if( ( $default_hardware_platform eq "sparc" ) && + ( -d "/usr/lib/sparcv9/" ) ) { + $default_hardware_platform="sparcv9"; + } if( $default_hardware_platform eq "sparc" ) { $ldapsearch = "/usr/lib/mozldap6/ldapsearch"; } elsif( $default_hardware_platform eq "sparcv9" ) { diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec index 4925e871..831b0278 100644 --- a/pki/dogtag/util/pki-util.spec +++ b/pki/dogtag/util/pki-util.spec @@ -1,6 +1,6 @@ Name: pki-util Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - PKI Utility Framework URL: http://pki.fedoraproject.org/ License: GPLv2 with exceptions @@ -76,13 +76,15 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE -%{_datadir}/java/pki +%{_datadir}/java/pki/ %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%{_javadocdir}/%{name}-%{version}/ %changelog +* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2 +- Bugzilla Bug #521989 - packaging for Fedora Dogtag +- Take ownership of directories * Tue Oct 13 2009 Ade Lee <alee@redhat.com> 1.3.0-1 - Bugzilla Bug #521989 - packaging for Fedora Dogtag |