libosinfo-1.1.0-1.parabola1: updating version

2 files changed, 46 insertions, 69 deletions

diff --git a/libre/libosinfo/PKGBUILD b/libre/libosinfo/PKGBUILD
index fb7c6821b..880554fac 100644
--- a/libre/libosinfo/PKGBUILD
+++ b/libre/libosinfo/PKGBUILD
@@ -1,30 +1,34 @@
 # $Id: PKGBUILD 191823 2016-10-10 10:17:01Z bgyorgy $
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Daniel Milewski <niitotantei@gmail.com>
 
 pkgname=libosinfo
-pkgver=1.0.0
-pkgrel=1.parabola2
+pkgver=1.1.0
+pkgrel=1.parabola1
 pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without non-FSDG compliant distros and operating systems support"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://libosinfo.org/"
 license=('GPL' 'LGPL')
 depends=('glib2' 'libxslt' 'osinfo-db')
-makedepends=('check' 'gobject-introspection' 'intltool' 'libsoup' 'vala')
+makedepends=('check' 'gobject-introspection' 'intltool' 'libsoup' 'vala' 'gtk-doc')
 conflicts=(${pkgname}-libre)
 replaces=(${pkgname}-libre)
 options=('!libtool')
-source=(https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$pkgver.tar.gz
+source=(https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.gz{,.asc}
         libre.patch)
-sha256sums=('f7b425ecde5197d200820eb44401c5033771a5d114bd6390230de768aad0396b'
-            '5120733768a39b24a02d19f2c4aa7d8e827dfee1aeefe2e2e6fe48f1ebcf4ce5')
+validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF') # Daniel P. Berrange
+sha256sums=('600f43a4a8dae5086a01a3d44bcac2092b5fa1695121289806d544fb287d3136'
+            'SKIP'
+            'a0465c4f4c5ae1dd8559b0262475202cbca54a85deb4eb2138978d9175ed478d')
 
 prepare() {
   cd $pkgname-$pkgver
+  sed -i '/export LC_ALL = C/d' maint.mk
 
-  rm -rv {docs,test/isodata/*}
+  rm -rv {docs,tests/isodata/*}
 
   patch -Np1 -i ../libre.patch
 
@@ -39,7 +43,8 @@ build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-              --with-pci-ids-path=/usr/share/hwdata/pci.ids
+              --with-pci-ids-path=/usr/share/hwdata/pci.ids \
+              --enable-gtk-doc
   make
 }
 
diff --git a/libre/libosinfo/libre.patch b/libre/libosinfo/libre.patch
index 3ed7eed7b..2d845fabb 100644
--- a/libre/libosinfo/libre.patch
+++ b/libre/libosinfo/libre.patch
@@ -1,67 +1,57 @@
-diff --git a/Makefile.am b/Makefile.am
-index 240485e..a0aa67c 100644
---- a/Makefile.am
-+++ b/Makefile.am
+--- libosinfo-1.1.0.orig/Makefile.am	2017-04-28 09:30:18.000000000 -0500
++++ libosinfo-1.1.0/Makefile.am	2017-10-25 01:26:54.389870956 -0500
 @@ -1,5 +1,5 @@
  
--SUBDIRS = osinfo test tools docs po examples
-+SUBDIRS = osinfo test tools po examples
+-SUBDIRS = osinfo tests tools docs po examples
++SUBDIRS = osinfo tests tools po examples
  
  INTLTOOL_FILES = \
  	intltool-extract.in \
-diff --git a/Makefile.in b/Makefile.in
-index 915463a..2af13d1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -428,7 +428,7 @@ target_alias = @target_alias@
+--- libosinfo-1.1.0.orig/Makefile.in	2017-08-15 05:29:56.000000000 -0500
++++ libosinfo-1.1.0/Makefile.in	2017-10-25 01:28:07.243272077 -0500
+@@ -429,7 +429,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = osinfo test tools docs po examples
-+SUBDIRS = osinfo test tools po examples
+-SUBDIRS = osinfo tests tools docs po examples
++SUBDIRS = osinfo tests tools po examples
  INTLTOOL_FILES = \
  	intltool-extract.in \
  	intltool-merge.in \
-diff --git a/configure b/configure
-index b17c129..d1916af 100755
---- a/configure
-+++ b/configure
-@@ -15549,7 +15549,7 @@ fi
+--- libosinfo-1.1.0.orig/configure	2017-08-15 05:29:55.000000000 -0500
++++ libosinfo-1.1.0/configure	2017-10-25 01:30:40.046422902 -0500
+@@ -15599,7 +15599,7 @@
  GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
  
  
--ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile test/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile test/Makefile examples/Makefile po/Makefile.in"
+-ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile tests/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in"
++ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile tests/Makefile examples/Makefile po/Makefile.in"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -16638,8 +16638,6 @@ do
+@@ -16688,8 +16688,6 @@
      "osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;;
      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
 -    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
 -    "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
      "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
      "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-diff --git a/configure.ac b/configure.ac
-index f002cab..fab8d04 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -285,8 +285,6 @@ AC_CONFIG_FILES([
+--- libosinfo-1.1.0.orig/configure.ac	2017-05-02 10:44:07.000000000 -0500
++++ libosinfo-1.1.0/configure.ac	2017-10-25 01:31:42.313631867 -0500
+@@ -291,8 +291,6 @@
  	osinfo/osinfo_version.h
  	tools/Makefile
- 	test/Makefile
+ 	tests/Makefile
 -	docs/Makefile
 -	docs/reference/Makefile
  	examples/Makefile
  	po/Makefile.in
  ])
-diff --git a/examples/demo.js b/examples/demo.js
-index 28cf805..0f668bc 100755
---- a/examples/demo.js
-+++ b/examples/demo.js
-@@ -32,7 +32,7 @@ for (idx in osnames) {
+--- libosinfo-1.1.0.orig/examples/demo.js	2016-10-24 04:54:59.000000000 -0500
++++ libosinfo-1.1.0/examples/demo.js	2017-10-25 01:33:02.440040319 -0500
+@@ -32,7 +32,7 @@
      print ("  OS short id " + name)
  }
  
@@ -70,11 +60,9 @@ index 28cf805..0f668bc 100755
  var hvid = "http://qemu.org/qemu-kvm-0.11.0"
  var drvclass = "net"
  //var drvclass = "audio"
-diff --git a/examples/libosinfo-dummy-data.xml b/examples/libosinfo-dummy-data.xml
-index 65d23b7..8df9f37 100644
---- a/examples/libosinfo-dummy-data.xml
-+++ b/examples/libosinfo-dummy-data.xml
-@@ -64,87 +64,11 @@
+--- libosinfo-1.1.0.orig/examples/libosinfo-dummy-data.xml	2016-10-24 04:54:59.000000000 -0500
++++ libosinfo-1.1.0/examples/libosinfo-dummy-data.xml	2017-10-25 01:35:35.849830619 -0500
+@@ -64,87 +64,12 @@
    </devices>
  </platform>
  
@@ -119,11 +107,11 @@ index 65d23b7..8df9f37 100644
 -<os id="http://software.opensuse.org/112">
 -    <short-id>opensuse11.2</short-id>
 -    <name>OpenSuse 11.2</name>
--    <version>11.2</version>
--    <vendor>OpenSuse Project</vendor>
 +<os id="https://wiki.parabola.nu/Get_Parabola">
 +    <short-id>parabola</short-id>
 +    <name>Parabola GNU/Linux-libre</name>
+     <version>11.2</version>
+-    <vendor>OpenSuse Project</vendor>
 +    <vendor>Parabola Project</vendor>
  </os>
  
@@ -166,25 +154,9 @@ index 65d23b7..8df9f37 100644
 -
  <!-- End of backing data -->
  </libosinfo>
-diff --git b/po/POTFILES.skip b/po/POTFILES.skip
-new file mode 100644
-index 0000000..c867203
---- /dev/null
-+++ b/po/POTFILES.skip
-@@ -0,0 +1,8 @@
-+data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
-+data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
-diff --git a/test/test-isodetect.c b/test/test-isodetect.c
-index 64d0e9a..fa3ef27 100644
---- a/test/test-isodetect.c
-+++ b/test/test-isodetect.c
-@@ -366,90 +366,6 @@ static void test_one(const gchar *vendor)
+--- libosinfo-1.1.0.orig/tests/test-isodetect.c	2017-08-10 09:47:46.000000000 -0500
++++ libosinfo-1.1.0/tests/test-isodetect.c	2017-10-25 01:42:03.522453768 -0500
+@@ -376,90 +376,6 @@
      g_object_unref(loader);
  }
  
@@ -275,7 +247,7 @@ index 64d0e9a..fa3ef27 100644
  static Suite *
  list_suite(void)
  {
-@@ -457,20 +373,6 @@ list_suite(void)
+@@ -467,20 +383,6 @@
      TCase *tc = tcase_create("Core");
      tcase_set_timeout(tc, 20);