X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gitg.spec;h=e72ed054b9e6522e0dd286044d93d7a7f60ad93d;hb=481fc54dce821bc8835efb0c2ae983461549da6f;hp=7c09fee1ab66740780a61addccf602470944cc6f;hpb=2f163194f97ef27254e27f9e4db626ed3240baf8;p=packages%2Fgitg.git

diff --git a/gitg.spec b/gitg.spec
index 7c09fee..e72ed05 100644
--- a/gitg.spec
+++ b/gitg.spec
@@ -1,26 +1,28 @@
-# TODO: glade catalog?
 #
 # Conditional build:
 %bcond_without	static_libs	# static libraries
-#
+%bcond_without	glade		# Glade catalog
+
 Summary:	GTK+ git repository viewer
 Summary(pl.UTF-8):	Przeglądarka repozytoriów git oparta na GTK+
 Name:		gitg
-Version:	3.14.0
-Release:	0.1
+Version:	3.18.0
+Release:	3
 License:	GPL v2
 Group:		Development/Tools
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gitg/3.14/%{name}-%{version}.tar.xz
-# Source0-md5:	6cfd9cf5b219379b7144f1197b1cbc7a
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gitg/3.18/%{name}-%{version}.tar.xz
+# Source0-md5:	9d656124955e01e6c3c07fd40415a779
+Patch0:		%{name}-build.patch
 URL:		http://live.gnome.org/Gitg
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	gettext-devel >= 0.17
+BuildRequires:	gettext-tools >= 0.17
+%{?with_glade:BuildRequires:	glade-devel >= 3.2}
 BuildRequires:	glib2-devel >= 1:2.38
 BuildRequires:	gobject-introspection-devel >= 0.10.1
 BuildRequires:	gsettings-desktop-schemas-devel
-BuildRequires:	gtk+3-devel >= 3.10.0
-BuildRequires:	gtk-webkit3-devel >= 2.2
+BuildRequires:	gtk+3-devel >= 3.12.0
+BuildRequires:	gtk-webkit4-devel >= 2.2
 BuildRequires:	gtksourceview3-devel >= 3.10
 BuildRequires:	gtkspell3-devel >= 3.0.3
 BuildRequires:	intltool >= 0.40.0
@@ -28,12 +30,13 @@ BuildRequires:	json-glib-devel
 BuildRequires:	libgee-devel >= 0.8
 # libgit2 with threading support
 BuildRequires:	libgit2-devel >= 0.20.0-3
-BuildRequires:	libgit2-glib-devel >= 0.0.10
+BuildRequires:	libgit2-glib-devel >= 0.23.5
 BuildRequires:	libpeas-devel >= 1.5.0
 BuildRequires:	libpeas-gtk-devel >= 1.5.0
+BuildRequires:	libsecret-devel
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	pkgconfig
-BuildRequires:	python3-devel >= 3.2.3
+BuildRequires:	python3-devel >= 1:3.2.3
 BuildRequires:	python3-pygobject3-devel >= 3.0.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
@@ -45,12 +48,12 @@ Requires(post,postun):	desktop-file-utils
 Requires(post,preun):	glib2 >= 1:2.38
 Requires(post,postun):	gtk-update-icon-cache
 Requires:	glib2 >= 1:2.38
-Requires:	gtk+3 >= 3.10.0
-Requires:	gtk-webkit3 >= 2.2
+Requires:	gtk+3 >= 3.12.0
+Requires:	gtk-webkit4 >= 2.2
 Requires:	gtksourceview3 >= 3.10
 Requires:	gtkspell3 >= 3.0.3
 Requires:	libgit2 >= 0.20.0-3
-Requires:	libgit2-glib >= 0.0.10
+Requires:	libgit2-glib >= 0.23.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -70,9 +73,9 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libgitg
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.38
-Requires:	gtk+3-devel >= 3.10.0
+Requires:	gtk+3-devel >= 3.12.0
 Requires:	libgit2-devel >= 0.20.0-3
-Requires:	libgit2-glib-devel >= 0.0.10
+Requires:	libgit2-glib-devel >= 0.23.5
 
 %description devel
 libgitg header files.
@@ -92,13 +95,26 @@ libgitg static library.
 %description static -l pl.UTF-8
 Biblioteka statyczna libgitg.
 
+%package glade
+Summary:	libgitg catalog file for Glade
+Summary(pl.UTF-8):	Plik katalogu libgitg dla Glade
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	glade >= 3.2
+
+%description glade
+libgitg catalog file for Glade.
+
+%description glade -l pl.UTF-8
+Plik katalogu libgitg dla Glade.
+
 %package -n python3-gitg
 Summary:	Python 3.x binding to GitgExt library
 Summary(pl.UTF-8):	Wiązanie Pythona 3.x do biblioteki GitgExt
-Group:		Python/Libraries
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	python3-libs >= 3.2.3
+Group:		Libraries/Python
+BuildRequires:	python3-libs >= 1:3.2.3
 BuildRequires:	python3-pygobject3 >= 3.0.0
+Requires:	%{name} = %{version}-%{release}
 
 %description -n python3-gitg
 Python 3.x binding to GitgExt library, allowing to write Gitg plugins
@@ -114,6 +130,9 @@ Summary(pl.UTF-8):	API języka Vala do bibliotek Gitg
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	vala >= 2:0.20.1.23
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n vala-gitg
 Vala API for Gitg libraries.
@@ -123,6 +142,7 @@ API języka Vala do bibliotek Gitg.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -132,6 +152,7 @@ API języka Vala do bibliotek Gitg.
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_glade:--enable-glade-catalog} \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static}
 %{__make}
@@ -186,7 +207,8 @@ fi
 %{_datadir}/glib-2.0/schemas/org.gnome.gitg.gschema.xml
 %{_desktopdir}/gitg.desktop
 %{_mandir}/man1/gitg.1*
-%{_iconsdir}/hicolor/*/apps/gitg.*
+%{_iconsdir}/hicolor/*x*/apps/gitg.png
+%{_iconsdir}/hicolor/scalable/apps/gitg-symbolic.svg
 
 %files devel
 %defattr(644,root,root,755)
@@ -206,6 +228,12 @@ fi
 %{_libdir}/libgitg-ext-1.0.a
 %endif
 
+%if %{with glade}
+%files glade
+%defattr(644,root,root,755)
+%{_datadir}/glade/catalogs/gitg-glade.xml
+%endif
+
 %files -n python3-gitg
 %defattr(644,root,root,755)
 %{py3_sitedir}/gi/overrides/GitgExt.py