Update to upstream release 0.6.28

3 files changed, 8 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c309c0041c40..786bb4a3820c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libsolv
 	pkgdesc = Library for solving packages and reading repositories
-	pkgver = 0.6.27
-	pkgrel = 2
+	pkgver = 0.6.28
+	pkgrel = 1
 	url = https://github.com/openSUSE/libsolv
 	arch = i686
 	arch = x86_64
@@ -18,10 +18,8 @@ pkgbase = libsolv
 	optdepends = perl: for perl bindings
 	optdepends = python: for python bindings
 	optdepends = ruby: for ruby bindings
-	source = https://github.com/openSUSE/libsolv/archive/0.6.27/libsolv-0.6.27.tar.gz
-	source = Add-conditionals-for-swig-perl-bug-workaround.patch
-	md5sums = 04803110f87fe3840e611f902f18d8dc
-	md5sums = 1bb37f36b749a6174d6960c2f188d8aa
+	source = https://github.com/openSUSE/libsolv/archive/0.6.28/libsolv-0.6.28.tar.gz
+	md5sums = 663e6d0b618ab88ce4c1e30b0e2cdfa1
 
 pkgname = libsolv
 
diff --git a/Add-conditionals-for-swig-perl-bug-workaround.patch b/Add-conditionals-for-swig-perl-bug-workaround.patch
deleted file mode 100644
index b3bb29dd4ee9..000000000000
--- a/Add-conditionals-for-swig-perl-bug-workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 75fa844d8c3658c01b286f5c72d87fce373cfe0b Mon Sep 17 00:00:00 2001
-From: Michael Schroeder <mls@suse.de>
-Date: Mon, 19 Jun 2017 11:09:43 +0200
-Subject: [PATCH] Add conditionals for swig perl bug workaround
-
-It was fixed in swig-2.0.5 and gets in the way with newer perl
-versions.
----
- bindings/solv.i | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/bindings/solv.i b/bindings/solv.i
-index 043c5491..354cde70 100644
---- a/bindings/solv.i
-+++ b/bindings/solv.i
-@@ -330,7 +330,8 @@ typedef struct {
- 
- #if defined(SWIGPERL)
- 
--/* work around a swig bug */
-+/* work around a swig bug for swig versions < 2.0.5 */
-+#if SWIG_VERSION < 0x020005
- %{
- #undef SWIG_CALLXS
- #ifdef PERL_OBJECT
-@@ -343,6 +344,7 @@ typedef struct {
- #  endif
- #endif
- %}
-+#endif
- 
- 
- %define perliter(class)
diff --git a/PKGBUILD b/PKGBUILD
index 80134f24d1ab..52bf4a48edfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=libsolv
-pkgver=0.6.27
-pkgrel=2
+pkgver=0.6.28
+pkgrel=1
 pkgdesc="Library for solving packages and reading repositories"
 arch=('i686' 'x86_64')
 url="https://github.com/openSUSE/$pkgname"
@@ -10,14 +10,11 @@ makedepends=('cmake' 'perl' 'python' 'rpm-org' 'ruby' 'swig')
 optdepends=('perl: for perl bindings'
             'python: for python bindings'
             'ruby: for ruby bindings')
-source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        'Add-conditionals-for-swig-perl-bug-workaround.patch')
-md5sums=('04803110f87fe3840e611f902f18d8dc'
-         '1bb37f36b749a6174d6960c2f188d8aa')
+source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+md5sums=('663e6d0b618ab88ce4c1e30b0e2cdfa1')
 
 prepare() {
 	cd "$pkgname-$pkgver"
-	patch -p1 -i "$srcdir"/Add-conditionals-for-swig-perl-bug-workaround.patch
 	rm -rf build
 	mkdir build
 }