- 2.22.0

- merged from DEVEL

Changed files:
    bug-buddy.spec -> 1.62

diff --git a/bug-buddy.spec b/bug-buddy.spec
index f69e0c1d8334890ccc1df800b7aa5b4f020246f7..7131b1baaf374dc1417607a53113c306ed7ec950 100644 (file)
--- a/bug-buddy.spec
+++ b/bug-buddy.spec
@@ -1,40 +1,41 @@
 Summary:       Utility to ease the reporting of bugs within the GNOME
 Summary(pl.UTF-8):     Narzędzie ułatwiające zgłaszanie błędów w środowisku GNOME
 Name:          bug-buddy
-Version:       2.20.1
-Release:       2
+Version:       2.22.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: 6b9ea4c067674120bd93711b3b9a9e63
-Patch0:                %{name}-desktop.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: 092e1f91d0be4ca133cd0650622a6b06
+Patch0:                %{name}-pld.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.20.0
+BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: evolution-data-server-devel >= 1.12.0
+BuildRequires: automake >= 1:1.9
+BuildRequires: elfutils-devel
+BuildRequires: evolution-data-server-devel >= 2.22.0
 BuildRequires: gettext-devel
 BuildRequires: gnome-common
-BuildRequires: gnome-desktop-devel >= 2.20.0
+BuildRequires: gnome-desktop-devel >= 2.22.0
 BuildRequires: gnome-doc-utils >= 0.12.0
-BuildRequires: gnome-menus-devel >= 2.20.0
-BuildRequires: gnome-vfs2-devel >= 2.20.0
-BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: intltool >= 0.36.2
-BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.20.0
+BuildRequires: gnome-menus-devel >= 2.22.0
+BuildRequires: gnome-vfs2-devel >= 2.22.0
+BuildRequires: gtk+2-devel >= 2:2.12.5
+BuildRequires: intltool >= 0.37.0
+BuildRequires: libgnomeui-devel >= 2.22.0
 BuildRequires: libgtop-devel >= 2.14.8
-BuildRequires: libxml2-devel >= 1:2.6.30
-BuildRequires: libxslt-progs >= 1.1.20
+BuildRequires: libsoup-devel >= 2.4.0
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper >= 0.3.8
-Requires(post,postun): desktop-file-utils
+BuildRequires: sed >= 4.0
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): scrollkeeper
 Requires(post,preun):  GConf2
-Requires:      libgnomeui >= 2.20.0
+Requires:      gtk+2 >= 2:2.12.5
+Requires:      libgnomeui >= 2.22.0
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,12 +57,17 @@ KDE.
 %setup -q
 %patch0 -p1
 
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
+
 %build
 %{__glib_gettextize}
 %{__intltoolize}
+%{__libtoolize}
 %{__gnome_doc_common}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --disable-schemas-install \
@@ -75,13 +81,10 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.{l,}a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/bug-buddy/libbreakpad.{l,}a
-rm -rf $RPM_BUILD_ROOT%{_docdir}/breakpad-0.1
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/libgnomebreakpad.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/bug-buddy/libbreakpad.{l,}a
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,8 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 %gconf_schema_install bug-buddy.schemas
-%scrollkeeper_update_post
-%update_desktop_database_post
 %update_icon_cache hicolor
 
 %preun
@@ -98,20 +99,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 /sbin/ldconfig
-%scrollkeeper_update_postun
-%update_desktop_database_postun
 %update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/bug-buddy
+%attr(755,root,root) %{_bindir}/minidump_dump
+%attr(755,root,root) %{_bindir}/minidump_stackwalk
 %ifarch %{ix86}
 %dir %{_libdir}/bug-buddy
-%attr(755,root,root) %{_libdir}/bug-buddy/libbreakpad.so.*.*.*
+%attr(755,root,root) %{_libdir}/bug-buddy/libbreakpad.so*
 %endif
 %attr(755,root,root) %{_libdir}/gtk-2.0/modules/libgnomebreakpad.so
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/bug-buddy.desktop
 %{_iconsdir}/hicolor/*/*/bug-buddy.png
 %{_sysconfdir}/gconf/schemas/bug-buddy.schemas