From 2f323a56ceb8bc3acf8b0d39497a5a7f534de95a Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 21 Nov 2013 17:14:09 +0000 Subject: [PATCH 1/5] Update to 3.10.2 --- .gitignore | 1 + anjuta.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2a07c34..7c2d421 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /anjuta-3.9.91.tar.xz /anjuta-3.9.92.tar.xz /anjuta-3.10.0.tar.xz +/anjuta-3.10.2.tar.xz diff --git a/anjuta.spec b/anjuta.spec index 5e036f4..2a2b6b5 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -2,7 +2,7 @@ %global _python_bytecompile_errors_terminate_build 0 Name: anjuta -Version: 3.10.0 +Version: 3.10.2 Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) @@ -189,6 +189,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Thu Nov 21 2013 Richard Hughes - 1:3.10.2-1 +- Update to 3.10.2 + * Wed Sep 25 2013 Kalev Lember - 1:3.10.0-1 - Update to 3.10.0 diff --git a/sources b/sources index 648ce1f..2a37b80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7cd4ca20029d5f6ddf9fa3ab4520dfd anjuta-3.10.0.tar.xz +b88a472987ab692d5aad3949e348bde9 anjuta-3.10.2.tar.xz From 2626ad8b0ee32b82a98e07a5d958caeb63030303 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 26 Jan 2015 09:06:08 -0600 Subject: [PATCH 2/5] Update to 3.14.1 --- .gitignore | 1 + anjuta.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8be04f6..71ec9b9 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /anjuta-3.13.90.tar.xz /anjuta-3.13.92.tar.xz /anjuta-3.14.0.tar.xz +/anjuta-3.14.1.tar.xz diff --git a/anjuta.spec b/anjuta.spec index e0cb728..578d4b1 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -2,7 +2,7 @@ %global _python_bytecompile_errors_terminate_build 0 Name: anjuta -Version: 3.14.0 +Version: 3.14.1 Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for various programming languages (including C/C++, Python, Vala and JavaScript) @@ -179,6 +179,9 @@ fi %changelog +* Mon Jan 26 2015 Michael Catanzaro - 1:3.14.1-1 +- Update to 3.14.1 + * Sun Sep 21 2014 Kalev Lember - 1:3.14.0-1 - Update to 3.14.0 diff --git a/sources b/sources index 67119f6..fdd2500 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a2b0eca5ec9d59697e70b8e31b2b9e1 anjuta-3.14.0.tar.xz +f5deffdfb0d1a436bacbbdeb942b187c anjuta-3.14.1.tar.xz From ee45a1bcaead48e546ecb0a7aae8423a359ff95e Mon Sep 17 00:00:00 2001 From: Moez Roy Date: Sat, 14 Feb 2015 00:05:00 -0800 Subject: [PATCH 3/5] fix sources file --- sources | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sources b/sources index 1b9a486..2a37b80 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -<<<<<<< HEAD -8a2b0eca5ec9d59697e70b8e31b2b9e1 anjuta-3.14.0.tar.xz -======= b88a472987ab692d5aad3949e348bde9 anjuta-3.10.2.tar.xz ->>>>>>> origin/f20 From e150e9f94f47caa01cdb4773a18ae4d044d5f323 Mon Sep 17 00:00:00 2001 From: Moez Roy Date: Sat, 5 Dec 2015 11:03:20 -0800 Subject: [PATCH 4/5] comment out BuildRequires: perl(Locale::gettext) --- anjuta.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anjuta.spec b/anjuta.spec index 578d4b1..6c14422 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -25,7 +25,7 @@ BuildRequires: libgda-devel >= 5.1.0 BuildRequires: libgdl-devel >= 2.91.4 BuildRequires: libuuid-devel BuildRequires: neon-devel -BuildRequires: perl(Locale::gettext) +# BuildRequires: perl(Locale::gettext) BuildRequires: perl(XML::Parser) BuildRequires: python-devel BuildRequires: sqlite-devel From 21578dec3abf1beb8061826dfafa0de397493a0a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 15 Aug 2017 13:31:39 +0200 Subject: [PATCH 5/5] Add RHEL 7 conditionals --- anjuta.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/anjuta.spec b/anjuta.spec index f9d7d25..a5f08ac 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,6 +1,12 @@ # The Python templates in /usr/share/anjuta/project can not be byte-compiled. %global _python_bytecompile_errors_terminate_build 0 +%if 0%{?fedora} +%global with_python3 1 +%else +%global with_python3 0 +%endif + Name: anjuta Epoch: 1 Version: 3.22.0 @@ -27,7 +33,11 @@ BuildRequires: neon-devel BuildRequires: perl-generators BuildRequires: perl(Locale::gettext) BuildRequires: perl(XML::Parser) +%if 0%{?with_python3} BuildRequires: python3-devel +%else +BuildRequires: python-devel +%endif BuildRequires: sqlite-devel BuildRequires: subversion-devel BuildRequires: vala-devel @@ -75,7 +85,9 @@ sed -i -e '/vala/s/0\.32/0.34/g' configure %build +%if 0%{?with_python3} export PYTHON=%{__python3} +%endif %configure \ --disable-compile-warnings \ --disable-schemas-compile \