diff --git a/osinfo-db-20230518.tar.xz b/osinfo-db-20230518.tar.xz deleted file mode 100644 index 35f4312aa6836166490a37e7907817aef803623a..0000000000000000000000000000000000000000 Binary files a/osinfo-db-20230518.tar.xz and /dev/null differ diff --git a/osinfo-db-20230518.tar.xz.asc b/osinfo-db-20230518.tar.xz.asc deleted file mode 100644 index 38344b58ee60541fa594449bd1f81a06a92095e8..0000000000000000000000000000000000000000 --- a/osinfo-db-20230518.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEIG07NS9WbzsOZXLpl9kSPeN6SE8FAmRmJYwACgkQl9kSPeN6 -SE/AqA/+JhUFgVcGDaZ1c7/XBbLFN3QPhtKJd8A30YH2Xxd5/GEuKsnYUrAGpIe6 -oM3X+08cY2OEJSlb6zShV7NsqQtGcbgCmG4s01UJFC1lKSRWRQJlj7a48Ujo+Sd3 -dJafRY6AboOYNP0rVUqxsJX4Bgy26DmX/K+q8nZaZwS+nEPQ4XS1WY8l7g+sbGDb -IAflmpp2CGn7ofp68JCAGt1IJfdCQVece6rPitxdRp+SLIfTkeiHWW6sG9oPPoNW -9Lu4Dtk4DfnatgcDQQLvbA033q6SqZ46td9L0fnGDUQFn+oEh9+v6AR5cMWlWG47 -IHhDzFlkRUVXpz+AbfSCjssHkF3Xh7pLjpH/KVvyOZVZzeASRYXNXyRgemUZXw1U -U2T1WjINDQHUkkNwa+ORcF+p3u41Nn8vDRYf07HQPpW10qqCbHs50hxsSnV9Vgll -BfDC4IQ6sP7oEfIdNAYIpRjeO0FaL8g7R/Z4y48cfv1jbvgIL7WJQLSXjn82PhKI -URLAh47kxv4n6OBX3i/F8HTz5x3sAsNlLKVasHVyAoMSMneCT/CBdD7FUfExb7Ig -m+uVZ6pFQoX/lHlmXvcTYlP3o931o6ta4BxSsO1X0nwk9PBQxDDtyF7euwERBfKm -VzsT70zk3ViZZ3SxEZf5G13VKI/V6cIVqAu7tTOtVAj/FX5EWX0= -=yhtU ------END PGP SIGNATURE----- diff --git a/osinfo-db-20240701.tar.xz b/osinfo-db-20240701.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..4cea815dd06e65e9338a24944aebd0dce90e22b3 Binary files /dev/null and b/osinfo-db-20240701.tar.xz differ diff --git a/osinfo-db.spec b/osinfo-db.spec index 3f08b8545fb470c75882c8397f311aa81242404f..31b2db936ad32795728586162747535c182ff3ac 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -1,13 +1,11 @@ -%global debug_package %{nil} - Name: osinfo-db -Version: 20230518 +Version: 20240701 Summary: osinfo database files Release: 1 -License: LGPLv2+ +License: GPL-2.0-or-later +Buildarch: noarch URL: http://libosinfo.org/ Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz -Source1: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz.asc Source2: openeuler-22.03.xml Source3: sel-2.0.xml @@ -20,20 +18,17 @@ library. It provides information about guest operating systems for use with virtualization provisioning tools. %prep -%setup -q +%setup -cq -n %{name}-%{version} -%build -cd %{_builddir} -mkdir -p %{_builddir}/osinfo-db-%{version}/os/openeuler.org/ -mkdir -p %{_builddir}/osinfo-db-%{version}/os/suseeuler.net/ -cp %{SOURCE2} %{_builddir}/osinfo-db-%{version}/os/openeuler.org/ -cp %{SOURCE3} %{_builddir}/osinfo-db-%{version}/os/suseeuler.net/ -tar -cJf x.tar.xz osinfo-db-%{version} +install -D -m644 %{S:2} %{name}-%{version}/os/openeuler.org/openeuler-22.03.xml +install -D -m644 %{S:3} %{name}-%{version}/os/suseeuler.net/sel-2.0.xml +tar -cJf x.tar.xz %{name}-%{version} %install -osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo "%{_builddir}/x.tar.xz" +osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo "x.tar.xz" %files +%license %{name}-%{version}/LICENSE %{_datadir}/osinfo/datamap %{_datadir}/osinfo/device %{_datadir}/osinfo/install-script @@ -44,6 +39,10 @@ osinfo-db-import --root %{buildroot} --dir %{_datadir}/osinfo "%{_builddir}/x.t %{_datadir}/osinfo/LICENSE %changelog +* Sun Nov 03 2024 Funda Wang - 20240701-1 +- update to 20240701 +- reorganize spec so that it won't pollute outside build tree + * Mon Jul 17 2023 chenzixuan - 20230518-1 - update version to 20230518 diff --git a/osinfo-db.yaml b/osinfo-db.yaml index 46034fc97217206cfdf283bad1625627d9426d11..ddfa4357e7b414c7c57934e45b3a173e6c17093f 100644 --- a/osinfo-db.yaml +++ b/osinfo-db.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://gitlab.com/libosinfo/osinfo-db.git -tag_prefix: +tag_prefix: ^v separator: .