[certmonger/f14/master: 4/4] - explicitly require "dbus" to try to ensure we have a running system bus when we get started (#6391
by Nalin Dahyabhai
commit 3b70bc4e14274d1bad61a3636bc8e1cae839cc79
Merge: c77c673 c276b71
Author: Nalin Dahyabhai <nalin(a)redhat.com>
Date: Thu Sep 30 17:48:08 2010 -0400
- explicitly require "dbus" to try to ensure we have a running system bus when we get started (#639126)Merge remote branch 'origin/master' into f14/master
Conflicts:
certmonger.spec
certmonger.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc certmonger.spec
index 6e47d8e,097203d..82e46a3
--- a/certmonger.spec
+++ b/certmonger.spec
@@@ -101,7 -104,11 +104,11 @@@ exit
%{_localstatedir}/lib/certmonger
%changelog
+ * Thu Sep 30 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-4
+ - explicitly require "dbus" to try to ensure we have a running system bus
+ when we get started (#639126)
+
-* Wed Sep 29 2010 jkeating - 0.30-3
+* Wed Sep 29 2010 jkeating - 0.30-2.1
- Rebuilt for gcc bug 634757
* Thu Sep 23 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-2
9Â years, 2Â months
[certmonger: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/certmonger
by Nalin Dahyabhai
commit c276b718ef682c771eb211ab1bcf586d1e8b2613
Merge: 2f56706 d7a3dce
Author: Nalin Dahyabhai <nalin(a)redhat.com>
Date: Thu Sep 30 17:36:57 2010 -0400
Merge branch 'master' of ssh://pkgs.fedoraproject.org/certmonger
Conflicts:
certmonger.spec
certmonger.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc certmonger.spec
index 79ef1be,8811f01..097203d
--- a/certmonger.spec
+++ b/certmonger.spec
@@@ -1,6 -1,6 +1,6 @@@
Name: certmonger
Version: 0.30
--Release: 3%{?dist}
++Release: 4%{?dist}
Summary: Certificate status monitor and PKI enrollment client
Group: System Environment/Daemons
@@@ -104,10 -101,9 +104,13 @@@ exit
%{_localstatedir}/lib/certmonger
%changelog
- * Thu Sep 30 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-3
++* Thu Sep 30 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-4
+- explicitly require "dbus" to try to ensure we have a running system bus
+ when we get started (#639126)
+
+ * Wed Sep 29 2010 jkeating - 0.30-3
+ - Rebuilt for gcc bug 634757
+
* Thu Sep 23 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-2
- try to SIGHUP the messagebus daemon at first install so that it'll
let us claim our service name if it isn't restarted before we are
9Â years, 2Â months
[certmonger: 1/2] explicitly require "dbus" to try to ensure we have a running system bus when we get started (#639126
by Nalin Dahyabhai
commit 2f5670644b2816c7b167d1f7eb6d4e511bdd3917
Author: Nalin Dahyabhai <nalin(a)redhat.com>
Date: Thu Sep 30 17:36:08 2010 -0400
explicitly require "dbus" to try to ensure we have a running system bus when we get started (#639126)
certmonger.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/certmonger.spec b/certmonger.spec
index e7d8a4a..79ef1be 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -1,6 +1,6 @@
Name: certmonger
Version: 0.30
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Certificate status monitor and PKI enrollment client
Group: System Environment/Daemons
@@ -28,6 +28,9 @@ BuildRequires: /usr/bin/dbus-launch
# for dos2unix
BuildRequires: /usr/bin/dos2unix
+# we need a running system bus
+Requires: dbus
+
Requires(post): /sbin/chkconfig, /sbin/service
Requires(preun): /sbin/chkconfig, /sbin/service
@@ -101,6 +104,10 @@ exit 0
%{_localstatedir}/lib/certmonger
%changelog
+* Thu Sep 30 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-3
+- explicitly require "dbus" to try to ensure we have a running system bus
+ when we get started (#639126)
+
* Thu Sep 23 2010 Nalin Dahyabhai <nalin(a)redhat.com> 0.30-2
- try to SIGHUP the messagebus daemon at first install so that it'll
let us claim our service name if it isn't restarted before we are
9Â years, 2Â months
[shared-mime-info] - Update to 0.80
by Bastien Nocera
commit 05173973ef547433dad2b353e6cff47cfcdbed93
Author: Bastien Nocera <hadess(a)hadess.net>
Date: Thu Sep 30 22:21:26 2010 +0100
- Update to 0.80
.gitignore | 1 +
shared-mime-info.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61d277d..2bd9584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
shared-mime-info-0.71.tar.bz2
+/shared-mime-info-0.80.tar.bz2
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index add1c06..91f65f2 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
Summary: Shared MIME information database
Name: shared-mime-info
-Version: 0.71
-Release: 4%{?dist}
+Version: 0.80
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://freedesktop.org/Software/shared-mime-info
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man*/*
%changelog
+* Thu Sep 30 2010 Bastien Nocera <bnocera(a)redhat.com> 0.80-1
+- Update to 0.80
+
* Tue Jul 6 2010 Colin Walters <walters(a)verbum.org> - 0.71-4
- Fix previous change to be Requires(post); spotted by
Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
diff --git a/sources b/sources
index c298874..b85b400 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a90508234d415f761a79fbffdff74f4 shared-mime-info-0.71.tar.bz2
+eb8d24a6a80888849c9db7f30232ba6a shared-mime-info-0.80.tar.bz2
9Â years, 2Â months
[grantlee/f13/master] fixed spec
by Thomas Janssen
commit 9bc41d24b78177484044369d2821481b2fc2e65a
Author: Thomas Janssen <thomasj(a)fedoraproject.org>
Date: Thu Sep 30 23:11:55 2010 +0200
fixed spec
grantlee.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/grantlee.spec b/grantlee.spec
index f4d06f8..b351713 100644
--- a/grantlee.spec
+++ b/grantlee.spec
@@ -10,7 +10,7 @@ Summary: Qt string template engine based on the Django template system
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.gitorious.org/grantlee/pages/Home
-Source0: http://downloads.%{name}.org/%{name}-v%{version}.tar.gz
+Source0: http://downloads.%{name}.org/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel cmake
@@ -56,7 +56,7 @@ This package includes the Grantlee API documentation in HTML
format for easy browsing.
%prep
-%setup -q -n %{name}-v%{version}
+%setup -q
sed -i 's,${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX},%{_libdir},' CMakeLists.txt
9Â years, 2Â months