summaryrefslogtreecommitdiffstats
path: root/pki
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-11-11 02:19:15 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2009-11-11 02:19:15 +0000
commit003d644c8e64a0a75b93150c0f5456738a6eeab7 (patch)
tree4c1a2017bfedd46bee1f757491b922aa3c50ef28 /pki
parent91c78be5e22f099eae0832d141ca231fa5e04924 (diff)
downloadpki-003d644c8e64a0a75b93150c0f5456738a6eeab7.tar.gz
pki-003d644c8e64a0a75b93150c0f5456738a6eeab7.tar.xz
pki-003d644c8e64a0a75b93150c0f5456738a6eeab7.zip
Bugzilla Bug #533534 - pki-native-tools spec file should contain contents of
"setup_package". git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@814 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
-rw-r--r--pki/dogtag/native-tools/pki-native-tools.spec22
1 files changed, 18 insertions, 4 deletions
diff --git a/pki/dogtag/native-tools/pki-native-tools.spec b/pki/dogtag/native-tools/pki-native-tools.spec
index 19dc1541..5d0f1e45 100644
--- a/pki/dogtag/native-tools/pki-native-tools.spec
+++ b/pki/dogtag/native-tools/pki-native-tools.spec
@@ -1,6 +1,6 @@
Name: pki-native-tools
Version: 1.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Dogtag Certificate System - Native Tools
URL: http://pki.fedoraproject.org/
License: GPLv2 with exceptions
@@ -46,12 +46,24 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
## rearrange files to be in the desired native packaging layout
-./setup_package %{buildroot} pki native-tools %{version} %{release} %{buildroot}/opt
+mkdir -p %{buildroot}%{_libdir}/pki/native-tools
+cp -p %{buildroot}/opt/conf/* %{buildroot}%{_libdir}/pki/native-tools
+cp -p %{buildroot}/opt/samples/* %{buildroot}%{_libdir}/pki/native-tools
+cp -p %{buildroot}/usr/libexec/* %{buildroot}%{_libdir}/pki/native-tools
+
+# create wrappers
+for wrapper in bulkissuance p7tool revoker setpin sslget tkstool
+do
+ sed -e "s|\[PKI_PRODUCT\]|pki|g" \
+ -e "s|\[PKI_SUBSYSTEM\]|native_tools|g" \
+ -e "s|\[PKI_COMMAND\]|${wrapper}|g" \
+ %{buildroot}/opt/templates/pki_subsystem_command_wrapper > %{buildroot}/usr/bin/${wrapper} ;
+done
## remove unwanted files
rm -rf %{buildroot}/opt
rm -rf %{buildroot}/usr/libexec
-rm -rf %{buildroot}%{_datadir}/pki/templates
+rm -rf %{buildroot}%{_datadir}/pki
%clean
rm -rf %{buildroot}
@@ -61,9 +73,11 @@ rm -rf %{buildroot}
%doc LICENSE doc/README
%{_bindir}/*
%{_libdir}/pki
-%{_datadir}/pki
%changelog
+* Tue Nov 10 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-3
+- Bugzilla Bug #522895 - New Package for Dogtag PKI: native-tools
+- Moved contents of 'setup_package' to spec file
* Mon Nov 2 2009 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-2
- Bugzilla Bug #522895 - New Package for Dogtag PKI: native-tools
- Prepended directory path in front of setup_package