Bugzilla Bug #445402: Changing "linux"/"fedora" to "dogtag"; changing

"pki-svn.fedora.redhat.com" to "pki.fedoraproject.org".


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@158 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 10 insertions, 26 deletions

diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index 45dda5012..491379ebd 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -22,7 +22,7 @@
 
 ## Entity Definitions
 %define base_entity       Dogtag
-%define base_flavor       fedora
+%define base_flavor       dogtag
 %define base_prefix       pki
 
 ## Product Definitions
@@ -34,13 +34,13 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      16
+%define base_release      17
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
 %define base_packager     %{base_vendor} <http://bugzilla.redhat.com/bugzilla>
 %define base_summary      %{base_pki} - %{base_product}
-%define base_url          http://pki-svn.fedora.redhat.com/wiki/PKI_Documentation
+%define base_url          http://pki.fedoraproject.org/wiki/PKI_Documentation
 
 ## Pre & Post Install/Uninstall Scripts Definitions
 %define base_user         pkiuser
@@ -62,28 +62,9 @@
 ## Linux Definitions ##
 ##===================##
 %ifos Linux
-## check for presence of UI packages
-%define linux_ui          %(echo `rpm -q --quiet %{base_name}-ui; echo $?`)
-%define fedora_ui         %(echo `rpm -q --quiet %{base_flavor}-%{base_name}-ui; echo $?`)
-
-%if !%{linux_ui}
-## if the Linux UI package is present, default to using it first
-%define base_ui           %{base_name}-ui
-%else
-%if !%{fedora_ui}
-## otherwise, if the Fedora UI package is present, use it instead
-%define base_ui           %{base_flavor}-%{base_name}-ui
-%else
-## finally, if neither the Linux nor the Fedora UI packages are present,
-## set base_ui to be equal to the Linux UI package to ALWAYS produce a
-## "BuildRequires" dependency failure of "%{base_name}-ui"
-%define base_ui           %{base_name}-ui
-%endif
-%endif
-
-## For PKI version information, ALWAYS refer to the version of
-## the UI package dependency associated with this spec file!
-%define pki_version       %(echo `rpm -q --queryformat '%{VERSION}' %{base_ui}`)
+## For PKI version information, ALWAYS refer to the version of the
+## Dogtag UI package dependency associated with this Dogtag spec file!
+%define pki_version       %(echo `rpm -q --queryformat '%{VERSION}' %{base_flavor}-%{base_name}-ui`)
 %define pki_major_version %(echo `echo %{pki_version} | awk -F. '{ print $1 }'`)
 %define pki_minor_version %(echo `echo %{pki_version} | awk -F. '{ print $2 }'`)
 %define pki_patch_version %(echo `echo %{pki_version} | awk -F. '{ print $3 }'`)
@@ -142,7 +123,7 @@ BuildRoot:      %{_builddir}/%{base_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, %{base_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{base_prefix}-util >= 1.0.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4
+BuildRequires:  ant >= 1.6.2, %{base_flavor}-%{base_name}-ui >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{base_prefix}-util >= 1.0.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4
 
 ## Without Requires something, rpmbuild will abort!
 Requires:       %{base_name}-ui, %{base_prefix}-common >= 1.0.0
@@ -282,6 +263,9 @@ fi
 ###############################################################################
 
 %changelog
+* Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-17
+- Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed
+                         "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org"
 * Mon Nov 24 2008 Ade Lee <alee@redhat.com> 1.0.0-16
 - Bugzilla Bug #237727 - selinux changes to init script
 * Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-15