diff --git a/.gitignore b/.gitignore
index 999f2bc..81b540e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/glade-3.15.0.tar.xz
+SOURCES/glade-3.20.0.tar.xz
diff --git a/.glade.metadata b/.glade.metadata
index 2bd9440..adcc26e 100644
--- a/.glade.metadata
+++ b/.glade.metadata
@@ -1 +1 @@
-846b679f9faa4352672d9d9011bf9cc1ae36ce90 SOURCES/glade-3.15.0.tar.xz
+6a651b00245a8bfdf13eba8533c8d3610bc7b80a SOURCES/glade-3.20.0.tar.xz
diff --git a/SOURCES/0001-Add-man-pages.patch b/SOURCES/0001-Add-man-pages.patch
deleted file mode 100644
index 6070104..0000000
--- a/SOURCES/0001-Add-man-pages.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-diff -up glade-3.15.0/configure.ac.man-pages glade-3.15.0/configure.ac
---- glade-3.15.0/configure.ac.man-pages 2013-03-06 15:58:47.000000000 -0500
-+++ glade-3.15.0/configure.ac 2013-06-26 15:02:30.060301314 -0400
-@@ -195,6 +195,22 @@ AM_CONDITIONAL(BUILD_PYTHON, test x"$hav
-
- YELP_HELP_INIT
-
-+# ==================================================================
-+# Man pages (requires xsltproc)
-+# ==================================================================
-+
-+AC_ARG_ENABLE(man-pages,
-+ AC_HELP_STRING([--enable-man-pages],
-+ [build manual pages]),,
-+ enable_man_pages=yes)
-+if test x$enable_man_pages = xyes; then
-+ AC_PATH_PROG([XSLTPROC], [xsltproc])
-+ if test x$XSLTPROC = x; then
-+ AC_MSG_ERROR([xsltproc is required to build manual pages])
-+ fi
-+fi
-+AM_CONDITIONAL(BUILD_MAN_PAGES, test x$enable_man_pages = xyes)
-+
- dnl ================================================================
- dnl Check for windows
- dnl ================================================================
-@@ -298,6 +314,7 @@ po/Makefile.in
- doc/Makefile
- doc/version.xml
- help/Makefile
-+man/Makefile
- build/mingw-w64/glade.nsi
- ])
-
-@@ -314,4 +331,5 @@ Configuration:
- Introspection Data: ${found_introspection}
-
- Build Reference Manual: ${enable_gtk_doc}
-+ Build Manual Pages: ${enable_man_pages}
- "
-diff -up glade-3.15.0/Makefile.am.man-pages glade-3.15.0/Makefile.am
---- glade-3.15.0/Makefile.am.man-pages 2013-06-26 15:04:34.414063451 -0400
-+++ glade-3.15.0/Makefile.am 2013-06-26 15:05:09.949281239 -0400
-@@ -1,6 +1,10 @@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
- SUBDIRS = po data gladeui src plugins doc help
-+if BUILD_MAN_PAGES
-+SUBDIRS += man
-+endif
-+DIST_SUBDIRS = po data gladeui src plugins doc help man
-
- EXTRA_DIST = \
- autogen.sh \
-diff -up glade-3.15.0/man/glade-previewer.xml.man-pages glade-3.15.0/man/glade-previewer.xml
---- glade-3.15.0/man/glade-previewer.xml.man-pages 2013-06-26 15:02:30.061301320 -0400
-+++ glade-3.15.0/man/glade-previewer.xml 2013-06-26 15:02:30.060301314 -0400
-@@ -0,0 +1,105 @@
-+
-+
-+
-+
-+
-+
-+ glade-previewer
-+ GNOME
-+
-+
-+
-+ Maintainer
-+ Tristan Van Berkom
-+ Van Berkom
-+ tristan.van.berkom@gmail.com
-+
-+
-+ Maintainer
-+ Juan Pablo
-+ Ugarte
-+ juanpablougarte@gmail.com
-+
-+
-+
-+
-+
-+
-+ glade-previewer
-+ 1
-+ User Commands
-+
-+
-+
-+ glade-previewer
-+ Preview glade user interface definitions
-+
-+
-+
-+
-+ glade-previewer OPTION
-+
-+
-+
-+
-+ Description
-+
-+ glade-previewer is a tool that
-+ can load and display a User Interface that has been defined
-+ with glade. glade itself uses glade-previewer, but it
-+ can also be used as a standalone utility.
-+
-+
-+
-+ Options
-+
-+ The following options can be specified:
-+
-+
-+
-+ ,
-+
-+ Name of the file to preview.
-+
-+
-+
-+
-+ ,
-+
-+ Name of the toplevel to preview.
-+
-+
-+
-+ ,
-+
-+ Listen on standard input.
-+
-+
-+
-+ ,
-+
-+ Output version information and exit.
-+
-+
-+
-+
-+
-+ X display to use.
-+
-+
-+
-+
-+ One of the or
-+ options has to be specified.
-+
-+
-+
-+
-+ See Also
-+
-+ glade1
-+
-+
-+
-+
-diff -up glade-3.15.0/man/glade.xml.man-pages glade-3.15.0/man/glade.xml
---- glade-3.15.0/man/glade.xml.man-pages 2013-06-26 15:02:30.061301320 -0400
-+++ glade-3.15.0/man/glade.xml 2013-06-26 15:02:30.061301320 -0400
-@@ -0,0 +1,114 @@
-+
-+
-+
-+
-+
-+
-+ glade
-+ GNOME
-+
-+
-+
-+ Maintainer
-+ Tristan Van Berkom
-+ Van Berkom
-+ tristan.van.berkom@gmail.com
-+
-+
-+ Maintainer
-+ Juan Pablo
-+ Ugarte
-+ juanpablougarte@gmail.com
-+
-+
-+
-+
-+
-+
-+ glade
-+ 1
-+ User Commands
-+
-+
-+
-+ glade
-+ Create GTK+ user interfaces
-+
-+
-+
-+
-+ glade OPTION FILE
-+
-+
-+
-+
-+ Description
-+
-+ glade is a tool to create or edit
-+ user interfaces for GTK+ or GNOME applications. It saves
-+ the user interface descriptions in xml files which can be
-+ read by the GtkBuilder API that is part of GTK+.
-+
-+
-+
-+ Options
-+
-+ The following options can be specified:
-+
-+
-+
-+ ,
-+
-+ Show help options.
-+
-+
-+
-+
-+
-+ Show all help options.
-+
-+
-+
-+
-+
-+ Show Glade debug options.
-+
-+
-+
-+
-+
-+ Show GTK+ options.
-+
-+
-+
-+
-+
-+ Output version information
-+ and exit.
-+
-+
-+
-+
-+
-+ Disable devhelp integration.
-+
-+
-+
-+
-+
-+ X display to use.
-+
-+
-+
-+
-+
-+
-+
-+ See Also
-+
-+ devhelp1
-+
-+
-+
-+
-diff -up glade-3.15.0/man/Makefile.am.man-pages glade-3.15.0/man/Makefile.am
---- glade-3.15.0/man/Makefile.am.man-pages 2013-06-26 15:02:30.061301320 -0400
-+++ glade-3.15.0/man/Makefile.am 2013-06-26 15:02:30.061301320 -0400
-@@ -0,0 +1,22 @@
-+XSLTPROC_FLAGS = \
-+ --nonet \
-+ --stringparam man.output.quietly 1 \
-+ --stringparam funcsynopsis.style ansi \
-+ --stringparam man.th.extra1.suppress 1 \
-+ --stringparam man.authors.section.enabled 0 \
-+ --stringparam man.copyright.section.enabled 0
-+
-+.xml.1:
-+ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-+
-+man_MANS = \
-+ glade.1 \
-+ glade-previewer.1
-+
-+xml_files = $(man_MANS:.1=.xml)
-+
-+EXTRA_DIST = $(xml_files)
-+
-+DISTCLEANFILES = $(man_MANS)
-+
-+-include $(top_srcdir)/git.mk
diff --git a/SOURCES/glade-3.15.0-keywords.patch b/SOURCES/glade-3.15.0-keywords.patch
deleted file mode 100644
index 39ca928..0000000
--- a/SOURCES/glade-3.15.0-keywords.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5abd0de8ab3ddb6a4d7594cd73700ca12f23e117 Mon Sep 17 00:00:00 2001
-From: Richard Hughes
-Date: Tue, 19 Mar 2013 08:47:51 +0000
-Subject: [PATCH] Fix the Malayalam translation
-
-Fixes: Keywords[ml] in group 'Desktop Entry' does not have a semicolon (';') as trailing character.
----
- po/ml.po | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/ml.po b/po/ml.po
-index 1a7e867..e257ee5 100644
---- a/po/ml.po
-+++ b/po/ml.po
-@@ -40,7 +40,7 @@ msgstr "GTK+ പ്റോഗ്റാമുകള്ക്കുളള യൂ
-
- #: ../data/glade.desktop.in.in.h:5
- msgid "GUI designer;user interface;ui builder;"
--msgstr "ജി യു ഐ ഡിസൈനര്;യുസര് ഇന്റര്ഫേസ്;യു ഐ ബില്ടാര് "
-+msgstr "ജി യു ഐ ഡിസൈനര്;യുസര് ഇന്റര്ഫേസ്;യു ഐ ബില്ടാര്;"
-
- #: ../src/glade.glade.h:1
- msgid "Select"
---
-1.8.1.4
-
diff --git a/SPECS/glade.spec b/SPECS/glade.spec
index 5e22fcd..74f0f0a 100644
--- a/SPECS/glade.spec
+++ b/SPECS/glade.spec
@@ -1,9 +1,6 @@
-%global _changelog_trimtime %(date +%s -d "1 year ago")
-
-
Name: glade
-Version: 3.15.0
-Release: 5%{?dist}
+Version: 3.20.0
+Release: 1%{?dist}
Summary: User Interface Designer for GTK+
# - /usr/bin/glade is GPLv2+
@@ -12,12 +9,11 @@ Summary: User Interface Designer for GTK+
# GPLv2+ and LGPLv2+ code, so the resulting binaries are GPLv2+
License: GPLv2+ and LGPLv2+
URL: http://glade.gnome.org/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/glade/3.15/glade-%{version}.tar.xz
-Patch0: glade-3.15.0-keywords.patch
-Patch1: 0001-Add-man-pages.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glade/3.20/glade-%{version}.tar.xz
BuildRequires: chrpath
BuildRequires: desktop-file-utils
+BuildRequires: docbook-style-xsl
BuildRequires: gettext
BuildRequires: gtk3-devel
BuildRequires: intltool
@@ -25,15 +21,10 @@ BuildRequires: itstool
BuildRequires: libxml2-devel
BuildRequires: pygobject3-devel
BuildRequires: python2-devel
-BuildRequires: docbook-style-xsl
-BuildRequires: libxslt
-# BRs for autoreconf
-BuildRequires: autoconf automake libtool
-BuildRequires: intltool
-BuildRequires: gnome-common
-BuildRequires: yelp-tools
+BuildRequires: /usr/bin/appstream-util
+BuildRequires: /usr/bin/xsltproc
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# The gtk3 version of glade was packaged under the name of 'glade3' for a
# while. However, following upstream naming, 'glade3' package is now the gtk2
# version and 'glade' package is the gtk3 one. The obsoletes are here to
@@ -60,7 +51,7 @@ a separate library to ease the integration of Glade into other applications.
%package devel
Summary: Development files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: glade3-libgladeui-devel < 1:3.11.0-3
%description devel
@@ -70,12 +61,7 @@ developing applications that use Glade widget library.
%prep
%setup -q
-%patch0 -p1 -b .keywords
-%patch1 -p1 -b .man-pages
-aclocal
-autoconf
-automake
%build
%configure --disable-static
@@ -87,7 +73,7 @@ make %{?_smp_mflags}
%install
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+%make_install
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
# Remove rpaths.
@@ -98,6 +84,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.so
%check
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/glade.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/glade.desktop
@@ -121,16 +108,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f glade.lang
-%doc AUTHORS COPYING* NEWS README
+%license COPYING*
+%doc AUTHORS NEWS README
%{_bindir}/glade
%{_bindir}/glade-previewer
%{_datadir}/applications/glade.desktop
%{_datadir}/icons/hicolor/*/apps/glade.png
-%{_mandir}/man1/glade.1.gz
-%{_mandir}/man1/glade-previewer.1.gz
+%{_datadir}/icons/hicolor/scalable/apps/glade-symbolic.svg
+%{_datadir}/appdata/glade.appdata.xml
+%{_mandir}/man1/glade.1*
+%{_mandir}/man1/glade-previewer*
%files libs
-%doc COPYING*
+%license COPYING*
%{_libdir}/girepository-1.0/Gladeui-2.0.typelib
%dir %{_libdir}/glade/
%dir %{_libdir}/glade/modules/
@@ -147,6 +137,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc %{_datadir}/gtk-doc/
%changelog
+* Tue Mar 22 2016 Kalev Lember - 3.20.0-1
+- Update to 3.20.0
+- Resolves: #1386873
+
* Fri Jan 24 2014 Daniel Mach - 3.15.0-5
- Mass rebuild 2014-01-24