[abrt/f12/master: 46/46] Merge branch 'f13' into f12

[Jiří Moskovčák]

commit 0e7799da6a4faf8d7875890cc464e618c200d779
Merge: eda8d44 035b745
Author: Jiri Moskovcak <jmoskovc at redhat.com>
Date:   Thu Aug 12 15:10:09 2010 +0200

    Merge branch 'f13' into f12
    
    Conflicts:
    	.gitignore
    	abrt.spec
    	sources

 .gitignore                 |    2 +
 abrt.init                  |    2 +-
 abrt.spec                  |  306 ++++++++++++++++++++++++++++++++++----------
 abrt_disable_gpgcheck.diff |   11 ++
 blacklist.patch            |   22 +++
 polkit.patch               |  104 +++++++++++++++
 sources                    |    2 +-
 7 files changed, 378 insertions(+), 71 deletions(-)
---
diff --cc abrt.spec
index 41d6fba,a6ee992..109ca6f
--- a/abrt.spec
+++ b/abrt.spec
@@@ -225,8 -236,12 +236,12 @@@ Virtual package to make easy default in
  
  %prep
  %setup -q
- %patch0 -p1 -b ~hideprefs
- %patch1 -p1 -b .blacklist_mono
+ %patch0 -p1 -b .hideprefs
+ # rawhide packages are not signed, so we need to disable the gpg check
 -%patch1 -p1 -b .disable_gpg_check
++#%patch1 -p1 -b .disable_gpg_check
+ # general patches
+ %patch2 -p1 -b .blacklist_mono
+ %patch3 -p1 -b .polkit
  
  %build
  %configure
@@@ -297,7 -341,14 +341,13 @@@ f
  if [ "$1" -eq "0" ]; then
      service %{name}d condrestart >/dev/null 2>&1 || :
  fi
+ #systemd
+ %if %{?with_systemd}
+ if [ "$1" -eq "0" ]; then
+     /bin/systemctl try-restart %{name}d.service >/dev/null 2>&1 || :
+ fi
+ %endif
  
 -
  %files -f %{name}.lang
  %defattr(-,root,root,-)
  %doc README COPYING