From 153488a888ca87dcc7277df64c06de6df7900faa Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Wed, 18 Feb 2015 00:15:12 +0530 Subject: [PATCH 1/6] New package: galculator-gtk2-2.1.3 --- srcpkgs/galculator-gtk2/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/galculator-gtk2/template diff --git a/srcpkgs/galculator-gtk2/template b/srcpkgs/galculator-gtk2/template new file mode 100644 index 0000000000..63d0f4de8b --- /dev/null +++ b/srcpkgs/galculator-gtk2/template @@ -0,0 +1,19 @@ +# Template file for 'galculator' + +pkgname="galculator-gtk2" +_pkgname="galculator" +version="2.1.3" +revision=1 +wrksrc="${_pkgname}-${version}" +build_style=gnu-configure +configure_args="--disable-gtk3" +depends="gtk-update-icon-cache" +makedepends="gtk+-devel" +hostmakedepends="intltool pkg-config" +conflicts="galculator-gtk3" +short_desc="GTK+ based scientific calculator" +maintainer="Aaditya Bagga " +license="GPL-2" +homepage="galculator.sourceforge.net" +distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.bz2" +checksum="91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235" From 0bc581e8653b962cf2a9ed5fbc4ea81f68de8cf2 Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Wed, 18 Feb 2015 00:15:26 +0530 Subject: [PATCH 2/6] New package: galculator-gtk3-2.1.3 --- srcpkgs/galculator-gtk3/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/galculator-gtk3/template diff --git a/srcpkgs/galculator-gtk3/template b/srcpkgs/galculator-gtk3/template new file mode 100644 index 0000000000..8b5000750a --- /dev/null +++ b/srcpkgs/galculator-gtk3/template @@ -0,0 +1,18 @@ +# Template file for 'galculator' + +pkgname="galculator-gtk3" +_pkgname="galculator" +version="2.1.3" +revision=1 +wrksrc="${_pkgname}-${version}" +build_style=gnu-configure +depends="gtk-update-icon-cache" +makedepends="gtk+3-devel" +hostmakedepends="intltool pkg-config" +conflicts="galculator-gtk2" +short_desc="GTK+ based scientific calculator" +maintainer="Aaditya Bagga " +license="GPL-2" +homepage="galculator.sourceforge.net" +distfiles="http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${version}.tar.bz2" +checksum="91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235" From 6c08385f3b9d8ad6c616bf443a5a7fb9c7fb801e Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Wed, 18 Feb 2015 00:37:21 +0530 Subject: [PATCH 3/6] galculator2: correct conflicts --- srcpkgs/galculator-gtk2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/galculator-gtk2/template b/srcpkgs/galculator-gtk2/template index 63d0f4de8b..c05ab7e1af 100644 --- a/srcpkgs/galculator-gtk2/template +++ b/srcpkgs/galculator-gtk2/template @@ -10,7 +10,7 @@ configure_args="--disable-gtk3" depends="gtk-update-icon-cache" makedepends="gtk+-devel" hostmakedepends="intltool pkg-config" -conflicts="galculator-gtk3" +conflicts="galculator-gtk3>=0" short_desc="GTK+ based scientific calculator" maintainer="Aaditya Bagga " license="GPL-2" From 60bf488993ad0879bda855c8fae6e92bdac9b493 Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Wed, 18 Feb 2015 00:37:36 +0530 Subject: [PATCH 4/6] galculator2: correct conflicts and use --- srcpkgs/galculator-gtk3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/galculator-gtk3/template b/srcpkgs/galculator-gtk3/template index 8b5000750a..b42d273ac4 100644 --- a/srcpkgs/galculator-gtk3/template +++ b/srcpkgs/galculator-gtk3/template @@ -9,10 +9,10 @@ build_style=gnu-configure depends="gtk-update-icon-cache" makedepends="gtk+3-devel" hostmakedepends="intltool pkg-config" -conflicts="galculator-gtk2" +conflicts="galculator-gtk2>=0" short_desc="GTK+ based scientific calculator" maintainer="Aaditya Bagga " license="GPL-2" homepage="galculator.sourceforge.net" -distfiles="http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${version}.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.bz2" checksum="91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235" From e2b509002efc9d7d34c22d1e11b7871a76b241fe Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Wed, 18 Feb 2015 01:12:46 +0530 Subject: [PATCH 5/6] galculator-gtk2: use {pkgname%-*} instead of custom _pkgname --- srcpkgs/galculator-gtk2/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/galculator-gtk2/template b/srcpkgs/galculator-gtk2/template index c05ab7e1af..8f3258b9a0 100644 --- a/srcpkgs/galculator-gtk2/template +++ b/srcpkgs/galculator-gtk2/template @@ -1,10 +1,9 @@ # Template file for 'galculator' pkgname="galculator-gtk2" -_pkgname="galculator" version="2.1.3" revision=1 -wrksrc="${_pkgname}-${version}" +wrksrc="${pkgname%-*}-${version}" build_style=gnu-configure configure_args="--disable-gtk3" depends="gtk-update-icon-cache" @@ -15,5 +14,5 @@ short_desc="GTK+ based scientific calculator" maintainer="Aaditya Bagga " license="GPL-2" homepage="galculator.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/${pkgname%-*}/${pkgname%-*}-${version}.tar.bz2" checksum="91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235" From d4a7bc3ded18dd45a677547aae15183e52be2e51 Mon Sep 17 00:00:00 2001 From: Aaditya Bagga Date: Wed, 18 Feb 2015 01:13:02 +0530 Subject: [PATCH 6/6] galculator-gtk3: use {pkgname%-*} instead of custom _pkgname --- srcpkgs/galculator-gtk3/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/galculator-gtk3/template b/srcpkgs/galculator-gtk3/template index b42d273ac4..d3916f5917 100644 --- a/srcpkgs/galculator-gtk3/template +++ b/srcpkgs/galculator-gtk3/template @@ -1,10 +1,9 @@ # Template file for 'galculator' pkgname="galculator-gtk3" -_pkgname="galculator" version="2.1.3" revision=1 -wrksrc="${_pkgname}-${version}" +wrksrc="${pkgname%-*}-${version}" build_style=gnu-configure depends="gtk-update-icon-cache" makedepends="gtk+3-devel" @@ -14,5 +13,5 @@ short_desc="GTK+ based scientific calculator" maintainer="Aaditya Bagga " license="GPL-2" homepage="galculator.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/${pkgname%-*}/${pkgname%-*}-${version}.tar.bz2" checksum="91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235"