[packaging] Branch 'f12/custom-kolabsys.com' - fedora-packager.spec

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun Nov 14 15:33:53 CET 2010


 fedora-packager.spec |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 690feb895a7a7154bb419a117bdc75f6e6fd30b9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Nov 14 14:26:28 2010 +0000

    Fix typo, fix cert locations

diff --git a/fedora-packager.spec b/fedora-packager.spec
index 4288c8b..686cf0f 100644
--- a/fedora-packager.spec
+++ b/fedora-packager.spec
@@ -6,7 +6,7 @@ Epoch:		1
 
 Name:           fedora-packager
 Version:        0.5.1.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Tools for setting up a fedora maintainer environment
 
 Group:          Applications/Productivity
@@ -110,6 +110,8 @@ cp -a src/fedora_cert src/kolab_cert
 sed -i \
     -e 's/fedpkg/kolabpkg/g' \
     -e 's/fedora_cert/kolab_cert/g' \
+    -e 's/\.fedora\.cert/.kolab.cert/g' \
+    -e 's/\.fedora-server-ca\.cert/.kolab.ca.cert/g' \
     src/kolabpkg.bash \
     src/kolabpkg.py \
     src/kolab-cert.py \
@@ -118,7 +120,7 @@ sed -i \
 
 sed -i -r \
     -e 's|^LOOKASIDE =.*$|LOOKASIDE = "http://pkgs.kolabsys.com/repo/pkgs"|g' \
-    -e 's|^LOOKASIDE_CGI =.*$|LOOKASIDE_GCI = "https://pkgs.kolabsys.com/repo/pkgs/upload.cgi"|g' \
+    -e 's|^LOOKASIDE_CGI =.*$|LOOKASIDE_CGI = "https://pkgs.kolabsys.com/repo/pkgs/upload.cgi"|g' \
     -e 's|^GITBASEURL =.*$|GITBASEURL = "ssh://\%\(user\)s at git.kolabsys.com/git/rpm/\%\(module\)s"|g' \
     -e 's|ANONGITURL =.*$|ANONGITURL = "git://git.kolabsys.com/git/rpm/\%\(module\)s"|g' \
     src/pykolabpkg/__init__.py
@@ -172,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/bash_completion.d/kolabpkg.bash
 
 %changelog
-* Sun Nov 14 2010 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.5.1.4-11
+* Sun Nov 14 2010 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.5.1.4-12
 - Fix substitution for pykolabpkg
 
 * Sat Nov 13 2010 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.5.1.4-10




More information about the packaging-commits mailing list