libosinfo: remove libre suffix and add complex pkgrel

2 files changed, 0 insertions, 334 deletions

diff --git a/libre/libosinfo-libre/PKGBUILD b/libre/libosinfo-libre/PKGBUILD
deleted file mode 100644
index 27c637bb1..000000000
--- a/libre/libosinfo-libre/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 109557 2014-04-15 23:23: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@parabola.nu>
-# Contributor: Daniel Milewski <niitotantei@gmail.com>
-
-_pkgname=libosinfo
-pkgname=libosinfo-libre
-pkgver=0.2.10
-pkgrel=2
-pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://libosinfo.org/"
-license=('GPL' 'LGPL')
-depends=('glib2' 'libxslt')
-makedepends=('check' 'gobject-introspection' 'intltool' 'libsoup' 'vala')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=($_pkgname)
-options=('!libtool')
-source=(https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz
-        libre.patch)
-sha256sums=('564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d'
-            '46d1c192f3730b5b02a52140a8f1abbacd6d41968c29cec9205f0cec77336a17')
-
-prepare() {
-  cd $_pkgname-$pkgver
-
-  rm data/datamaps/windows-lang.xml \
-     data/hypervisors/rhel-xen.xml{,.in} \
-     data/install-scripts/*.xml \
-     data/oses/*.xml{,.in}
-  rm -r test/isodata/*
-
-  patch -Np1 -i ../libre.patch
-
-  cd po
-  for file in *.po; do
-    intltool-update ${file%.*}
-    msgattrib --no-obsolete -o $file $file
-  done
-}
-
-build() {
-  cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --enable-udev \
-              --with-udev-rulesdir=/usr/lib/udev/rules.d \
-              --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-              --with-pci-ids-path=/usr/share/hwdata/pci.ids
-  make
-}
-
-check() {
-  cd $_pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/libre/libosinfo-libre/libre.patch b/libre/libosinfo-libre/libre.patch
deleted file mode 100644
index 50213db8b..000000000
--- a/libre/libosinfo-libre/libre.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -ruN libosinfo-0.2.10/data/datamaps/Makefile.am libosinfo-0.2.10-libre/data/datamaps/Makefile.am
---- libosinfo-0.2.10/data/datamaps/Makefile.am	2013-11-21 16:58:04.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/datamaps/Makefile.am	2014-04-27 16:45:16.440167522 +0200
-@@ -1,7 +1,6 @@
- 
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA =     \
--  windows-lang.xml   \
-   x11-keyboard.xml   \
-   $(NULL)
- 
-diff -ruN libosinfo-0.2.10/data/datamaps/Makefile.in libosinfo-0.2.10-libre/data/datamaps/Makefile.in
---- libosinfo-0.2.10/data/datamaps/Makefile.in	2014-03-20 18:52:11.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/datamaps/Makefile.in	2014-04-27 16:45:39.787204801 +0200
-@@ -331,7 +331,6 @@
- top_srcdir = @top_srcdir@
- datamapdir = $(pkgdatadir)/db/datamaps/
- datamap_DATA = \
--  windows-lang.xml   \
-   x11-keyboard.xml   \
-   $(NULL)
- 
-diff -ruN libosinfo-0.2.10/data/hypervisors/Makefile.am libosinfo-0.2.10-libre/data/hypervisors/Makefile.am
---- libosinfo-0.2.10/data/hypervisors/Makefile.am	2013-11-21 16:58:04.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/hypervisors/Makefile.am	2014-04-27 16:51:11.999126605 +0200
-@@ -1,6 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
- 
-diff -ruN libosinfo-0.2.10/data/hypervisors/Makefile.in libosinfo-0.2.10-libre/data/hypervisors/Makefile.in
---- libosinfo-0.2.10/data/hypervisors/Makefile.in	2014-03-20 18:52:11.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/hypervisors/Makefile.in	2014-04-27 16:51:25.042665608 +0200
-@@ -330,7 +330,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/hypervisors/
--database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
-+database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
- database_DATA = $(database_in_files:.xml.in=.xml)
- EXTRA_DIST = $(database_in_files) $(database_DATA)
- all: all-am
-diff -ruN libosinfo-0.2.10/data/install-scripts/Makefile.am libosinfo-0.2.10-libre/data/install-scripts/Makefile.am
---- libosinfo-0.2.10/data/install-scripts/Makefile.am	2014-03-06 22:42:00.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/install-scripts/Makefile.am	2014-04-27 16:57:22.658340718 +0200
-@@ -1,14 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA =     \
--  debian.xml        \
--  fedora.xml        \
--  rhel.xml          \
--  ubuntu.xml        \
--  windows-sif.xml   \
--  windows-cmd.xml   \
--  windows-reg.xml   \
--  windows-unattend.xml \
-   $(NULL)
- 
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.10/data/install-scripts/Makefile.in libosinfo-0.2.10-libre/data/install-scripts/Makefile.in
---- libosinfo-0.2.10/data/install-scripts/Makefile.in	2014-03-20 18:52:11.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/install-scripts/Makefile.in	2014-04-27 16:57:57.302215753 +0200
-@@ -331,14 +331,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/install-scripts/
- database_DATA = \
--  debian.xml        \
--  fedora.xml        \
--  rhel.xml          \
--  ubuntu.xml        \
--  windows-sif.xml   \
--  windows-cmd.xml   \
--  windows-reg.xml   \
--  windows-unattend.xml \
-   $(NULL)
- 
- EXTRA_DIST = $(database_DATA)
-diff -ruN libosinfo-0.2.10/data/oses/Makefile.am libosinfo-0.2.10-libre/data/oses/Makefile.am
---- libosinfo-0.2.10/data/oses/Makefile.am	2014-02-21 15:14:17.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/oses/Makefile.am	2014-04-27 17:04:12.968082285 +0200
-@@ -1,27 +1,6 @@
- 
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = 	\
--	altlinux.xml.in \
--	centos.xml.in   \
--	debian.xml.in   \
--	dos.xml.in      \
--	fedora.xml.in   \
--	freebsd.xml.in  \
--	gnome.xml.in	\
--	mageia.xml.in \
--	mandriva.xml.in \
--	mandrake.xml.in \
--	netbsd.xml.in	\
--	netware.xml.in  \
--	macos.xml.in    \
--	openbsd.xml.in  \
--	opensuse.xml.in \
--	rhl.xml.in      \
--	rhel.xml.in     \
--	solaris.xml.in  \
--	suse.xml.in     \
--	ubuntu.xml.in   \
--	windows.xml.in  \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.10/data/oses/Makefile.in libosinfo-0.2.10-libre/data/oses/Makefile.in
---- libosinfo-0.2.10/data/oses/Makefile.in	2014-03-20 18:52:11.000000000 +0100
-+++ libosinfo-0.2.10-libre/data/oses/Makefile.in	2014-04-27 17:05:17.082415532 +0200
-@@ -331,27 +331,6 @@
- top_srcdir = @top_srcdir@
- databasedir = $(pkgdatadir)/db/oses/
- database_in_files = \
--	altlinux.xml.in \
--	centos.xml.in   \
--	debian.xml.in   \
--	dos.xml.in      \
--	fedora.xml.in   \
--	freebsd.xml.in  \
--	gnome.xml.in	\
--	mageia.xml.in \
--	mandriva.xml.in \
--	mandrake.xml.in \
--	netbsd.xml.in	\
--	netware.xml.in  \
--	macos.xml.in    \
--	openbsd.xml.in  \
--	opensuse.xml.in \
--	rhl.xml.in      \
--	rhel.xml.in     \
--	solaris.xml.in  \
--	suse.xml.in     \
--	ubuntu.xml.in   \
--	windows.xml.in  \
- 	$(NULL)
- 
- database_DATA = $(database_in_files:.xml.in=.xml)
-diff -ruN libosinfo-0.2.10/po/POTFILES.in libosinfo-0.2.10-libre/po/POTFILES.in
---- libosinfo-0.2.10/po/POTFILES.in	2014-02-21 15:14:17.000000000 +0100
-+++ libosinfo-0.2.10-libre/po/POTFILES.in	2014-04-27 17:09:40.876525788 +0200
-@@ -1,31 +1,9 @@
--data/oses/netware.xml.in
--data/oses/solaris.xml.in
--data/oses/dos.xml.in
--data/oses/mageia.xml.in
--data/oses/mandrake.xml.in
--data/oses/mandriva.xml.in
--data/oses/suse.xml.in
--data/oses/gnome.xml.in
--data/oses/rhel.xml.in
--data/oses/fedora.xml.in
--data/oses/windows.xml.in
--data/oses/opensuse.xml.in
--data/oses/macos.xml.in
--data/oses/debian.xml.in
--data/oses/ubuntu.xml.in
--data/oses/centos.xml.in
--data/oses/openbsd.xml.in
--data/oses/freebsd.xml.in
--data/oses/rhl.xml.in
--data/oses/netbsd.xml.in
--data/oses/altlinux.xml.in
- data/devices/qemu-ps2.xml.in
- data/devices/qemu-pci.xml.in
- data/devices/virtio-pci.xml.in
- data/devices/qemu-usb.xml.in
- data/hypervisors/kvm.xml.in
- data/hypervisors/qemu.xml.in
--data/hypervisors/rhel-xen.xml.in
- data/hypervisors/xen.xml.in
- osinfo/osinfo_avatar_format.c
- osinfo/osinfo_deployment.c
-diff -ruN libosinfo-0.2.10/test/test-isodetect.c libosinfo-0.2.10-libre/test/test-isodetect.c
---- libosinfo-0.2.10/test/test-isodetect.c	2014-02-21 15:14:17.000000000 +0100
-+++ libosinfo-0.2.10-libre/test/test-isodetect.c	2014-04-27 16:27:40.353497937 +0200
-@@ -342,72 +342,6 @@
-     g_object_unref(loader);
- }
- 
--START_TEST(test_fedora)
--{
--    test_one("fedora");
--}
--END_TEST
--
--START_TEST(test_rhel)
--{
--    test_one("rhel");
--}
--END_TEST
--
--START_TEST(test_ubuntu)
--{
--    test_one("ubuntu");
--}
--END_TEST
--
--START_TEST(test_debian)
--{
--    test_one("debian");
--}
--END_TEST
--
--START_TEST(test_windows)
--{
--    test_one("windows");
--}
--END_TEST
--
--START_TEST(test_openbsd)
--{
--    test_one("openbsd");
--}
--END_TEST
--
--START_TEST(test_opensuse)
--{
--    test_one("opensuse");
--}
--END_TEST
--
--START_TEST(test_centos)
--{
--    test_one("centos");
--}
--END_TEST
--
--START_TEST(test_gnome)
--{
--    test_one("gnome");
--}
--END_TEST
--
--START_TEST(test_altlinux)
--{
--    test_one("altlinux");
--}
--END_TEST
--
--START_TEST(test_mageia)
--{
--    test_one("mageia");
--}
--END_TEST
--
- static Suite *
- list_suite(void)
- {
-@@ -415,17 +349,6 @@
-     TCase *tc = tcase_create("Core");
-     tcase_set_timeout(tc, 20);
- 
--    tcase_add_test(tc, test_fedora);
--    tcase_add_test(tc, test_rhel);
--    tcase_add_test(tc, test_ubuntu);
--    tcase_add_test(tc, test_debian);
--    tcase_add_test(tc, test_windows);
--    tcase_add_test(tc, test_openbsd);
--    tcase_add_test(tc, test_opensuse);
--    tcase_add_test(tc, test_centos);
--    tcase_add_test(tc, test_gnome);
--    tcase_add_test(tc, test_altlinux);
--    tcase_add_test(tc, test_mageia);
-     suite_add_tcase(s, tc);
-     return s;
- }