kalev pushed to gitg (master). "Update to 3.16.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 29 20:04:35 UTC 2015


>From 438f8394f3c7bd8d8abe866e857e1935b7757519 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Wed, 29 Apr 2015 22:03:17 +0200
Subject: Update to 3.16.1


diff --git a/.gitignore b/.gitignore
index 3b6797d..bc5d159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gitg-0.0.6.tar.bz2
 /gitg-3.15.1.tar.xz
 /gitg-3.15.2.tar.xz
 /gitg-3.16.0.tar.xz
+/gitg-3.16.1.tar.xz
diff --git a/0001-configure-Include-passed-in-cflags-for-threading-sup.patch b/0001-configure-Include-passed-in-cflags-for-threading-sup.patch
deleted file mode 100644
index 63abd88..0000000
--- a/0001-configure-Include-passed-in-cflags-for-threading-sup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1e0da0c37fe847fd7494f10bbba6ed1842d19efa Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember at gmail.com>
-Date: Wed, 15 Apr 2015 00:11:40 +0200
-Subject: [PATCH] configure: Include passed in cflags for threading support
- check
-
-This fixes the Fedora 23 build where the cflags and ldflags have to
-match. Otherwise, if the configure check throws away cflags but uses
-ldflags, the check fails with a linker error.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=747874
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 990b01c..5026655 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,8 +123,8 @@ AC_MSG_CHECKING([for libgit2-glib threading support])
- cflags_save="${CFLAGS}"
- libs_save="${LIBS}"
- 
--CFLAGS="${LIBGITG_CFLAGS}"
--LIBS="${LIBGITG_LIBS}"
-+CFLAGS="${CFLAGS} ${LIBGITG_CFLAGS}"
-+LIBS="${LIBS} ${LIBGITG_LIBS}"
- 
- AC_TRY_RUN([
- 	#include <libgit2-glib/ggit.h>
--- 
-2.3.5
-
diff --git a/gitg.spec b/gitg.spec
index b39765f..f9ff174 100644
--- a/gitg.spec
+++ b/gitg.spec
@@ -1,13 +1,11 @@
 Name:           gitg
-Version:        3.16.0
+Version:        3.16.1
 Release:        1%{?dist}
 Summary:        GTK+ graphical interface for the git revision control system
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Apps/Gitg/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.16/%{name}-%{version}.tar.xz
-# https://bugzilla.gnome.org/show_bug.cgi?id=747874
-Patch0:         0001-configure-Include-passed-in-cflags-for-threading-sup.patch
 
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
@@ -56,8 +54,6 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
 # Use webkitgtk4
 sed -i -e '/name="WebKit2"/ s/3\.0/4.0/' Gitg-1.0.gir
@@ -138,6 +134,9 @@ fi
 %{_includedir}/libgitg*-1.0
 
 %changelog
+* Wed Apr 29 2015 Kalev Lember <kalevlember at gmail.com> - 3.16.1-1
+- Update to 3.16.1
+
 * Tue Mar 24 2015 Kalev Lember <kalevlember at gmail.com> - 3.16.0-1
 - Update to 3.16.0
 
diff --git a/sources b/sources
index db2d9b8..4f0fed9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1baeb111693c511b01ff24001e2df8f2  gitg-3.16.0.tar.xz
+ea69e7d33d8d05fa86a9ba43769aa2cd  gitg-3.16.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gitg.git/commit/?h=master&id=438f8394f3c7bd8d8abe866e857e1935b7757519


More information about the scm-commits mailing list