[rpms/abrt] update-2.17.8: Merge branch 'master' of ssh://pkgs.fedoraproject.org/abrt

[rpms/abrt] update-2.17.8: Merge branch 'master' of ssh://pkgs.fedoraproject.org/abrt

[Jiri Moskovcak]

            A new commit has been pushed.

            Repo   : rpms/abrt
            Branch : update-2.17.8
            Commit : 30b8c3bc25f0f6d34b0c1f1e28c33df53987731a
            Author : Jiri Moskovcak <jmoskovc@redhat.com>
            Date   : 2011-02-18T10:16:40+01:00
            Stats  : +9/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/abrt/c/30b8c3bc25f0f6d34b0c1f1e28c33df53987731a?branch=update-2.17.8

            Log:
            Merge branch 'master' of ssh://pkgs.fedoraproject.org/abrt

Conflicts:
	abrt.spec

---
diff --git a/abrt.spec b/abrt.spec
index 6bc19ac..bd87f0f 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -496,6 +496,9 @@ fi
 * Fri Feb 18 2011 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.17-2
 - removed gnome-python2-vfs dependency
 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.17-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sat Feb 05 2011 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.17-1
 - rewritten abrt-debuginfo-install script to use the yum API
 - GUI: added search box to backtrace view rhbz#612017 (jmoskovc@redhat.com)

diff --git a/abrt.spec b/abrt.spec
index 417db01..bd87f0f 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -15,13 +15,13 @@
 %if "0%{?_buildid}" != "0"
 %define pkg_release 0.%{?_buildid}%{?dist}
 %else
-%define pkg_release 1%{?dist}
+%define pkg_release 2%{?dist}
 %endif
 
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 1.1.17
-Release: %{?pkg_release}.1
+Release: %{?pkg_release}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -80,7 +80,7 @@ Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-python, pygtk2, pygtk2-libglade,
-Requires: gnome-python2-gnomevfs, gnome-python2-gnomekeyring
+Requires: gnome-python2-gnomekeyring
 # only if gtk2 version < 2.17:
 #Requires: python-sexy
 # we used to have abrt-applet, now abrt-gui includes it:
@@ -493,6 +493,9 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Fri Feb 18 2011 Jiri Moskovcak <jmoskovc@redhat.com> 1.1.17-2
+- removed gnome-python2-vfs dependency
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.17-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild