[Libosinfo] [osinfo-db PATCH 2/4] haikur1beta1: Add info
Signed-off-by: Fabiano Fidêncio --- data/os/haiku-os.org/haiku-r1beta1.xml.in | 44 +++ 1 file changed, 44 insertions(+) create mode 100644 data/os/haiku-os.org/haiku-r1beta1.xml.in diff --git a/data/os/haiku-os.org/haiku-r1beta1.xml.in b/data/os/haiku-os.org/haiku-r1beta1.xml.in new file mode 100644 index 000..676dcba --- /dev/null +++ b/data/os/haiku-os.org/haiku-r1beta1.xml.in @@ -0,0 +1,44 @@ + + http://haiku-os.org/haiku/r1beta1;> +haikur1beta1 +<_name>Haiku R1/Beta1 +r1beta1 +<_vendor>Haiku, Inc. +haiku +haiku +http://haiku-os.org/haiku/r1alpha4.1"/> +http://haiku-os.org/haiku/r1alpha4.1"/> + +2018-09-28 + + + +bootimg +LINUX +3325952 + + + + + +bootimg +LINUX +3325952 + + + + + +10 +1 +536870912 +2147483648 + + +10 +1073741824 +4294967296 + + + + -- 1.8.3.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 4/4] haikur1beta1: Add tests data
Signed-off-by: Fabiano Fidêncio --- .../haikur1beta1/haiku-release-anyboot-x86.iso.txt | 29 ++ .../haiku-release-anyboot-x86_64.iso.txt | 29 ++ 2 files changed, 58 insertions(+) create mode 100644 tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt create mode 100644 tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt diff --git a/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt new file mode 100644 index 000..1031567 --- /dev/null +++ b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: bootimg +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1624 +El Torito VD version 1 found, boot catalog is in sector 32 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: +Hid 1 +Arch 0 (x86) +ID '' +Key 55 AA +Eltorito defaultboot header: +Bootid 88 (bootable) +Boot media 3 (2.88MB Floppy) +Load segment 0 +Sys type 0 +Nsect 1 +Bootoff 21 33 diff --git a/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt new file mode 100644 index 000..1031567 --- /dev/null +++ b/tests/isodata/haiku/haikur1beta1/haiku-release-anyboot-x86_64.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: LINUX +Volume id: bootimg +Volume set id: +Publisher id: +Data preparer id: +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM +Copyright File id: +Abstract File id: +Bibliographic File id: +Volume set size is: 1 +Volume set sequence number is: 1 +Logical block size is: 2048 +Volume size is: 1624 +El Torito VD version 1 found, boot catalog is in sector 32 +Joliet with UCS level 3 found +Rock Ridge signatures version 1 found +Eltorito validation header: +Hid 1 +Arch 0 (x86) +ID '' +Key 55 AA +Eltorito defaultboot header: +Bootid 88 (bootable) +Boot media 3 (2.88MB Floppy) +Load segment 0 +Sys type 0 +Nsect 1 +Bootoff 21 33 -- 1.8.3.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/4] haiku-nightly: Update volume-id
After some back and forth with haiku community, we've fixed Haiku's volume-id for nightly and new versions. Signed-off-by: Fabiano Fidêncio --- data/os/haiku-os.org/haiku-nightly.xml.in | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/os/haiku-os.org/haiku-nightly.xml.in b/data/os/haiku-os.org/haiku-nightly.xml.in index 4dfd660..f385a57 100644 --- a/data/os/haiku-os.org/haiku-nightly.xml.in +++ b/data/os/haiku-os.org/haiku-nightly.xml.in @@ -16,8 +16,13 @@ -bootimg -LINUX +haiku-nightly-x86 + + + + + +haiku-nightly-x86_64 -- 1.8.3.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH] centos7: Add CentOS 7 entry
"centos7" is the preferred way to display and advertise CentOS 7, mainly because CentOS does not support pointing releases at all. After talking with Jim Perrin, a CentOS board member, we've decided that the change from centos7.0 to centos7 would be the way to go. As we can't break backward compatibility, we can't just rename centos-7.0.xml.in to centos-7.xml.in and adjust the bits accordingly. Knowing that, the path to take is creating a new centos-7.xml.in entry that contains exactly the same content of centos-7.0.xml.in, adjust the bits in the new entry and change centos-7.0 to "clone" centos-7. Although this is not the most elegant solution, it ensures we properly advertise CentOS in the way its community wants and also do not break backward compatibility. Signed-off-by: Fabiano Fidêncio --- data/os/centos.org/centos-7.0.xml.in | 4 +- data/os/centos.org/centos-7.xml.in | 86 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 data/os/centos.org/centos-7.xml.in diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in index 7fc6d8d..bbfeb48 100644 --- a/data/os/centos.org/centos-7.0.xml.in +++ b/data/os/centos.org/centos-7.0.xml.in @@ -1,6 +1,8 @@ + + http://centos.org/centos/7.0;> centos7.0 <_name>CentOS 7.0 @@ -9,7 +11,7 @@ linux centos http://centos.org/centos/6.5"/> -http://redhat.com/rhel/7.6"/> +http://centos.org/centos/7"/> 2014-07-07 diff --git a/data/os/centos.org/centos-7.xml.in b/data/os/centos.org/centos-7.xml.in new file mode 100644 index 000..382bbc6 --- /dev/null +++ b/data/os/centos.org/centos-7.xml.in @@ -0,0 +1,86 @@ + + + + + http://centos.org/centos/7;> +centos7 +<_name>CentOS 7 +7 +<_vendor>CentOS +linux +centos +http://centos.org/centos/6.6"/> +http://redhat.com/rhel/7.6"/> + +2014-07-07 + + + <_name>CentOS 7 (GNOME) + + + <_name>CentOS 7 (KDE) + + + + https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso + +LINUX +CentOS 7 x86_64 + + isolinux/vmlinuz + isolinux/initrd.img + + + + + https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso + +LINUX +CentOS-7-x86_64-LiveGNOME* + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + + https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso + +LINUX +CentOS-7-x86_64-LiveKDE* + + isolinux/vmlinuz0 + isolinux/initrd0.img + + + + http://mirror.centos.org/centos-7/7/os/x86_64/ + +CentOS +^7$ +x86_64 + + + + + +1 +10 +1073741824 +10737418240 + + + +10 +1073741824 +10737418240 + + + + + + + + + -- 1.8.3.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
On Tue, 2019-03-05 at 10:43 -0500, Cole Robinson wrote: > On 3/5/19 10:31 AM, Fabiano Fidêncio wrote: > > On Tue, 2019-03-05 at 09:33 -0500, Cole Robinson wrote: > > > On 3/5/19 7:52 AM, Fabiano Fidêncio wrote: > > > > On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fidêncio wrote: > > > > > On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fidêncio wrote: > > > > > > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: > > > > > > > This series adds: > > > > > > > > > > > > > > * centos5 entries > > > > > > > * centos6 data > > > > > > > * scientificlinux 5.X > > > > > > > * scientificlinux 6.X > > > > > > > * scientificlinux 7.X > > > > > > > > > > > > > > No iso data is added, just URLs. I'm trying to get > > > > > > > osinfo-db > > > > > > > to > > > > > > > have > > > > > > > all the treeinfo coverage that virt-install has. > > > > > > > > > > > > Cole, in the general the series look good (apart from one > > > > > > change > > > > > > that > > > > > > has to be for "Add scientificlinux-7.X". > > > > > > > > > > > > There's one thing that I'm interested to know, though: > > > > > > - Is x.y considered EOL whenever x.(y+1) is released? I > > > > > > mean, > > > > > > will > > > > > > 7.6 > > > > > > be considered EOL whenever 7.7 is released? If so, we'd > > > > > > also > > > > > > have > > > > > > to > > > > > > add the EOL to the 7.x entries. > > > > > > > > > > > > Anyways, for patches #1 to #5: > > > > > > Reviewed-by: Fabiano Fidêncio > > > > > > > > > > Actually, let me take my "Reviewed-by" back. > > > > > Please, take a look at 5cac22bc68[0]. > > > > > > > > > > There, the commit message states: > > > > > centos: Remove URLs pointing to vault.centos.org > > > > > > > > > > As vault.centos.org doesn't keep any ISO anymore, let's just > > > > > remove > > > > > them from our db. > > > > > > > > > > Along with the URLs removal, let's remove together the tree's > > > > > as > > > > > those > > > > > can't be accessed without a valid URL. > > > > > > > > > > Removing all the vault.centos.org URLs matches with the > > > > > recommendation > > > > > given by CentOS folks in #centos-devel: > > > > > "so in short, if some program links to vault, it's most > > > > > likely > > > > > not a > > > > > good idea and may not even work" > > > > > > > > > > [0]: > > > > > https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108 > > > > > > > > > > So, I guess the path to take is to drop #1 and #3. > > > > > > > > Errr, dropping the URLs from #1 and #3, but keeping the > > > > tree/treeinfo. > > > > > > > > > > ACK from me, though what was centos reasoning for not pointing to > > > vault.centos.org tree URLs? Those have been stable for years in > > > my > > > experience. I can understand if they don't want those advertised > > > but > > > it's unclear why the comment suggests it might not work > > > > So, the whole conversation I had on #centos-devel was more about > > link > > to their medias than the tree itself, but let me try to summarise > > everything there: > > > > I've contacted #centos-devel because the EOL medias are always > > removed > > from vault, in a way that the links would automatically redirect > > to > > http://vault.centos.org/notonvault.html ... This is expected as a > > CentOS release becomes unsupported shortly after a new release > > comes > > out. > > > > The trees follow pretty much the same process as the one followed > > by > > the ISOs. So, for instance, while we have a valid tree for 6.10 ( > > http://mirror.centos.org/centos/6.10/os/x86_64), the tree for 6.9 > > is > > not valid anymore. Trying to access > > http://mirror.centos.org/centos/6.9/os/x86_64/ you'd get a 404 and > > http://mirror.centos.org/centos/6.9/ has one single file mentioning > > that the system has reached its EOL: > > http://mirror.centos.org/centos/6.9/readme > > > > Apart from that, I've also faced some issues where we'd have the > > tree > > but only with the sources but not with the packages. When I asked > > about > > that, the aswer that I got was that apps should not be relying on > > vault. > > > > Hmm I haven't seen that 'sources' issue but I guess if centos folks > say > 'dont use vault.centos.org' then we should listen to them. > > > One thing that we can do is to: > > - Always add the URL for the current supported release; > > - Remove the URL as soon as the new release is done; > > > Makes sense to me About our own soap-opera here ... I'll go with the Patches #1 and #3 as they were submitted. > > - Cole ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
On 3/5/19 10:31 AM, Fabiano Fidêncio wrote: > On Tue, 2019-03-05 at 09:33 -0500, Cole Robinson wrote: >> On 3/5/19 7:52 AM, Fabiano Fidêncio wrote: >>> On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fidêncio wrote: On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fidêncio wrote: > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: >> This series adds: >> >> * centos5 entries >> * centos6 data >> * scientificlinux 5.X >> * scientificlinux 6.X >> * scientificlinux 7.X >> >> No iso data is added, just URLs. I'm trying to get osinfo-db >> to >> have >> all the treeinfo coverage that virt-install has. > > Cole, in the general the series look good (apart from one > change > that > has to be for "Add scientificlinux-7.X". > > There's one thing that I'm interested to know, though: > - Is x.y considered EOL whenever x.(y+1) is released? I mean, > will > 7.6 > be considered EOL whenever 7.7 is released? If so, we'd also > have > to > add the EOL to the 7.x entries. > > Anyways, for patches #1 to #5: > Reviewed-by: Fabiano Fidêncio Actually, let me take my "Reviewed-by" back. Please, take a look at 5cac22bc68[0]. There, the commit message states: centos: Remove URLs pointing to vault.centos.org As vault.centos.org doesn't keep any ISO anymore, let's just remove them from our db. Along with the URLs removal, let's remove together the tree's as those can't be accessed without a valid URL. Removing all the vault.centos.org URLs matches with the recommendation given by CentOS folks in #centos-devel: "so in short, if some program links to vault, it's most likely not a good idea and may not even work" [0]: https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108 So, I guess the path to take is to drop #1 and #3. >>> >>> Errr, dropping the URLs from #1 and #3, but keeping the >>> tree/treeinfo. >>> >> >> ACK from me, though what was centos reasoning for not pointing to >> vault.centos.org tree URLs? Those have been stable for years in my >> experience. I can understand if they don't want those advertised but >> it's unclear why the comment suggests it might not work > > So, the whole conversation I had on #centos-devel was more about link > to their medias than the tree itself, but let me try to summarise > everything there: > > I've contacted #centos-devel because the EOL medias are always removed > from vault, in a way that the links would automatically redirect to > http://vault.centos.org/notonvault.html ... This is expected as a > CentOS release becomes unsupported shortly after a new release comes > out. > > The trees follow pretty much the same process as the one followed by > the ISOs. So, for instance, while we have a valid tree for 6.10 ( > http://mirror.centos.org/centos/6.10/os/x86_64), the tree for 6.9 is > not valid anymore. Trying to access > http://mirror.centos.org/centos/6.9/os/x86_64/ you'd get a 404 and > http://mirror.centos.org/centos/6.9/ has one single file mentioning > that the system has reached its EOL: > http://mirror.centos.org/centos/6.9/readme > > Apart from that, I've also faced some issues where we'd have the tree > but only with the sources but not with the packages. When I asked about > that, the aswer that I got was that apps should not be relying on > vault. > Hmm I haven't seen that 'sources' issue but I guess if centos folks say 'dont use vault.centos.org' then we should listen to them. > One thing that we can do is to: > - Always add the URL for the current supported release; > - Remove the URL as soon as the new release is done; > Makes sense to me - Cole ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
On Tue, 2019-03-05 at 09:33 -0500, Cole Robinson wrote: > On 3/5/19 7:52 AM, Fabiano Fidêncio wrote: > > On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fidêncio wrote: > > > On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fidêncio wrote: > > > > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: > > > > > This series adds: > > > > > > > > > > * centos5 entries > > > > > * centos6 data > > > > > * scientificlinux 5.X > > > > > * scientificlinux 6.X > > > > > * scientificlinux 7.X > > > > > > > > > > No iso data is added, just URLs. I'm trying to get osinfo-db > > > > > to > > > > > have > > > > > all the treeinfo coverage that virt-install has. > > > > > > > > Cole, in the general the series look good (apart from one > > > > change > > > > that > > > > has to be for "Add scientificlinux-7.X". > > > > > > > > There's one thing that I'm interested to know, though: > > > > - Is x.y considered EOL whenever x.(y+1) is released? I mean, > > > > will > > > > 7.6 > > > > be considered EOL whenever 7.7 is released? If so, we'd also > > > > have > > > > to > > > > add the EOL to the 7.x entries. > > > > > > > > Anyways, for patches #1 to #5: > > > > Reviewed-by: Fabiano Fidêncio > > > > > > Actually, let me take my "Reviewed-by" back. > > > Please, take a look at 5cac22bc68[0]. > > > > > > There, the commit message states: > > > centos: Remove URLs pointing to vault.centos.org > > > > > > As vault.centos.org doesn't keep any ISO anymore, let's just > > > remove > > > them from our db. > > > > > > Along with the URLs removal, let's remove together the tree's as > > > those > > > can't be accessed without a valid URL. > > > > > > Removing all the vault.centos.org URLs matches with the > > > recommendation > > > given by CentOS folks in #centos-devel: > > > "so in short, if some program links to vault, it's most likely > > > not a > > > good idea and may not even work" > > > > > > [0]: > > > https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108 > > > > > > So, I guess the path to take is to drop #1 and #3. > > > > Errr, dropping the URLs from #1 and #3, but keeping the > > tree/treeinfo. > > > > ACK from me, though what was centos reasoning for not pointing to > vault.centos.org tree URLs? Those have been stable for years in my > experience. I can understand if they don't want those advertised but > it's unclear why the comment suggests it might not work So, the whole conversation I had on #centos-devel was more about link to their medias than the tree itself, but let me try to summarise everything there: I've contacted #centos-devel because the EOL medias are always removed from vault, in a way that the links would automatically redirect to http://vault.centos.org/notonvault.html ... This is expected as a CentOS release becomes unsupported shortly after a new release comes out. The trees follow pretty much the same process as the one followed by the ISOs. So, for instance, while we have a valid tree for 6.10 ( http://mirror.centos.org/centos/6.10/os/x86_64), the tree for 6.9 is not valid anymore. Trying to access http://mirror.centos.org/centos/6.9/os/x86_64/ you'd get a 404 and http://mirror.centos.org/centos/6.9/ has one single file mentioning that the system has reached its EOL: http://mirror.centos.org/centos/6.9/readme Apart from that, I've also faced some issues where we'd have the tree but only with the sources but not with the packages. When I asked about that, the aswer that I got was that apps should not be relying on vault. One thing that we can do is to: - Always add the URL for the current supported release; - Remove the URL as soon as the new release is done; What do you think? Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 6/6] Add scientificlinux-7.X
On 3/5/19 7:25 AM, Fabiano Fidêncio wrote: > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: >> Scientific Linux is a RHEL clone, like CentOS. This adds the 7.X >> series. >> >> * Release dates are from here: >> https://www.scientificlinux.org/downloads/sl-versions/sl7/ >> * are taken from rhel7 metadata >> * Only x86_64 is available > > Cole, > > In this series there's a typo in all the "clones id=..." fields. > > This fixup should be pushed together with your patches: > fidencio@laerte ~/src/upstream/osinfo-db $ git diff HEAD~1 > diff --git a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in > index cc5544b..ea4e456 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.0.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.0.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/6.5"/> > -http://scientificlinux.org/scientificlinux/7.0"/> > +http://redhat.com/rhel/7.0"/> > > 2014-10-13 > > diff --git a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in > index 590d72e..b33747c 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.1.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.1.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/7.0"/> > -http://scientificlinux.org/scientificlinux/7.1"/> > +http://redhat.com/rhel/7.1"/> > > 2015-04-13 > > diff --git a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in > index ffc1762..26fcd2c 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.2.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.2.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/7.1"/> > -http://scientificlinux.org/scientificlinux/7.2"/> > +http://redhat.com/rhel/7.2"/> > > 2016-02-05 > > diff --git a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in > index a55a900..44d4a28 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.3.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.3.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/7.2"/> > -http://scientificlinux.org/scientificlinux/7.3"/> > +http://redhat.com/rhel/7.3"/> > > 2017-01-25 > > diff --git a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in > index bc2b147..e14e398 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.4.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.4.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/7.3"/> > -http://scientificlinux.org/scientificlinux/7.4"/> > +http://redhat.com/rhel/7.4"/> > > 2017-10-02 > > diff --git a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in > index bb7a267..e3b3134 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.5.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.5.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/7.4"/> > -http://scientificlinux.org/scientificlinux/7.5"/> > +http://redhat.com/rhel/7.5"/> > > 2018-05-10 > > diff --git a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in > b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in > index 21bf964..c877ffd 100644 > --- a/data/os/scientificlinux.org/scientificlinux-7.6.xml.in > +++ b/data/os/scientificlinux.org/scientificlinux-7.6.xml.in > @@ -9,7 +9,7 @@ > linux > scientificlinux > http://scientificlinux.org/scientificlinux/7.5"/> > -http://scientificlinux.org/scientificlinux/7.6"/> > +http://redhat.com/rhel/7.6"/> > > 2018-12-03 > > With the fixup: > Reviewed-by: Fabiano Fidêncio > Good catch, I screwed up the regex there. ACK Thanks, Cole ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
On 3/5/19 7:52 AM, Fabiano Fidêncio wrote: > On Tue, 2019-03-05 at 13:48 +0100, Fabiano Fidêncio wrote: >> On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fidêncio wrote: >>> On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: This series adds: * centos5 entries * centos6 data * scientificlinux 5.X * scientificlinux 6.X * scientificlinux 7.X No iso data is added, just URLs. I'm trying to get osinfo-db to have all the treeinfo coverage that virt-install has. >>> >>> Cole, in the general the series look good (apart from one change >>> that >>> has to be for "Add scientificlinux-7.X". >>> >>> There's one thing that I'm interested to know, though: >>> - Is x.y considered EOL whenever x.(y+1) is released? I mean, will >>> 7.6 >>> be considered EOL whenever 7.7 is released? If so, we'd also have >>> to >>> add the EOL to the 7.x entries. >>> >>> Anyways, for patches #1 to #5: >>> Reviewed-by: Fabiano Fidêncio >> >> Actually, let me take my "Reviewed-by" back. >> Please, take a look at 5cac22bc68[0]. >> >> There, the commit message states: >> centos: Remove URLs pointing to vault.centos.org >> >> As vault.centos.org doesn't keep any ISO anymore, let's just remove >> them from our db. >> >> Along with the URLs removal, let's remove together the tree's as >> those >> can't be accessed without a valid URL. >> >> Removing all the vault.centos.org URLs matches with the >> recommendation >> given by CentOS folks in #centos-devel: >> "so in short, if some program links to vault, it's most likely not a >> good idea and may not even work" >> >> [0]: >> https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108 >> >> So, I guess the path to take is to drop #1 and #3. > > Errr, dropping the URLs from #1 and #3, but keeping the tree/treeinfo. > ACK from me, though what was centos reasoning for not pointing to vault.centos.org tree URLs? Those have been stable for years in my experience. I can understand if they don't want those advertised but it's unclear why the comment suggests it might not work - Cole ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel
On Tue, Mar 05, 2019 at 02:58:54PM +0100, Fabiano Fidêncio wrote: > On Tue, 2019-03-05 at 14:52 +0100, Christophe Fergeau wrote: > > I'm not sure I'd make that one conditional on the fedora version. > > With > > the Obsoletes + Provides, upgrades will work fine, so this could be > > done > > on any fedora version. > > (I would not have made that change in the first place, but I guess > > now is too late ;) > > The change made on Fedora dist-git doesn't include the conditionals as > it was done only for F30+. > > Would you prefer to have the checks completely dropped? Yes, I don't think it is important that we generate the subpackage on f29, is it? Christophe signature.asc Description: PGP signature ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang macro
On Tue, 2019-03-05 at 14:34 +0100, Christophe Fergeau wrote:
> On Tue, Mar 05, 2019 at 10:42:26AM +0100, Fabiano Fidêncio wrote:
> > Signed-off-by: Fabiano Fidêncio
> > ---
> > mingw-osinfo-db-tools.spec.in | 10 ++
> > 1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-
> > tools.spec.in
> > index 486492f..14e275c 100644
> > --- a/mingw-osinfo-db-tools.spec.in
> > +++ b/mingw-osinfo-db-tools.spec.in
> > @@ -74,22 +74,24 @@ information about operating systems for use
> > with virtualization
> > rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
> > rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
> >
> > -%files -n mingw32-osinfo-db-tools
> > +%find_lang osinfo-db-tools
> > +grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-
> > db-tools.lang
> > +grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-
> > db-tools.lang
>
> Why not %mingw_find_lang ?
Aha, didn't know about that one.
Yesterday, when adding the mingw-osinfo-db-tools package to Fedora, the
suggestion to use %find_lang has been made.
I'll give it a try with %mingw_find_lang then.
[snip]
Best Regards,
--
Fabiano Fidêncio
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to %ldconfig_scriptlets
On Tue, 2019-03-05 at 14:47 +0100, Christophe Fergeau wrote: > On Tue, Mar 05, 2019 at 10:37:49AM +0100, Fabiano Fidêncio wrote: > > This commit is bringing upstream the change done on Fedora on > > af0ce7aab60e. > > Feature is documented at > https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets > I'm not sure el7 will have it, but I don't know what we aim to > support > with this spec file. So, according to https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets#Scope ... "Macroize ldconfig scriptletsf28 + f27 + f26 + epel7 + el6." I'll give it a try on EL7 anyways and post back the results. [snip] Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel
On Tue, 2019-03-05 at 14:52 +0100, Christophe Fergeau wrote: > I'm not sure I'd make that one conditional on the fedora version. > With > the Obsoletes + Provides, upgrades will work fine, so this could be > done > on any fedora version. > (I would not have made that change in the first place, but I guess > now is too late ;) The change made on Fedora dist-git doesn't include the conditionals as it was done only for F30+. Would you prefer to have the checks completely dropped? [snip] Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 7/7] mingw, spec: Fix the Source URL
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:55AM +0100, Fabiano Fidêncio wrote:
> https://releases.pagure.org/libosinfo/... instead of
> https://releases.pagure.io/libosinfo/...
>
> Signed-off-by: Fabiano Fidêncio
> ---
> libosinfo.spec.in | 2 +-
> mingw-libosinfo.spec.in | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 3cf73ff..6a2f2c3 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -5,7 +5,7 @@ Name: libosinfo
> Version: @VERSION@
> Release: 1%{?dist}
> License: LGPLv2+
> -Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> +Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: https://libosinfo.org/
> BuildRequires: gcc
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index 14b4c60..cfcc04e 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -5,7 +5,7 @@ Version: @VERSION@
> Release: 1%{?dist}
> Summary: MinGW Windows port of a library for managing OS information for
> virtualization
> License: LGPLv2+
> -Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
> +Source: https://releases.pagure.org/libosinfo/libosinfo-%{version}.tar.gz
> URL: https://libosinfo.org/
>
> BuildArch: noarch
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 6/7] mingw: Use %find_Lang macro
On Tue, Mar 05, 2019 at 10:37:54AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio
> ---
> mingw-libosinfo.spec.in | 10 ++
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index e99885c..14b4c60 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -89,7 +89,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
> rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
> rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
>
> -%files -n mingw32-libosinfo
> +%find_lang osinfo-db-tools
> +grep "%{mingw32_datadir}" libosinfo.lang > mingw32-libosinfo.lang
> +grep "%{mingw64_datadir}" libosinfo.lang > mingw64-libosinfo.lang
> +
Probably can be %mingw_find_lang?
> +%files -n mingw32-libosinfo -f mingw32-libosinfo.lang
> %doc AUTHORS ChangeLog COPYING.LIB NEWS README
> %{mingw32_bindir}/osinfo-detect.exe
> %{mingw32_bindir}/osinfo-install-script.exe
> @@ -103,9 +107,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
> %dir %{mingw32_datadir}/libosinfo
> %{mingw32_datadir}/libosinfo/usb.ids
> %{mingw32_datadir}/libosinfo/pci.ids
> -%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
>
> -%files -n mingw64-libosinfo
> +%files -n mingw64-libosinfo -f mingw64-libosinfo.lang
> %doc AUTHORS ChangeLog COPYING.LIB NEWS README
> %{mingw64_bindir}/osinfo-detect.exe
> %{mingw64_bindir}/osinfo-install-script.exe
> @@ -119,6 +122,5 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
> %dir %{mingw64_datadir}/libosinfo
> %{mingw64_datadir}/libosinfo/usb.ids
> %{mingw64_datadir}/libosinfo/pci.ids
> -%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
>
> %changelog
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel
I'm not sure I'd make that one conditional on the fedora version. With
the Obsoletes + Provides, upgrades will work fine, so this could be done
on any fedora version.
(I would not have made that change in the first place, but I guess
now is too late ;)
On Tue, Mar 05, 2019 at 10:37:53AM +0100, Fabiano Fidêncio wrote:
> This commit brings upstream the changes done on Fedora on
> 42b96ea66d7b3e.
>
> Signed-off-by: Fabiano Fidêncio
> ---
> libosinfo.spec.in | 14 ++
> 1 file changed, 14 insertions(+)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 6aae7d7..3cf73ff 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -14,7 +14,9 @@ BuildRequires: glib2-devel
> BuildRequires: libxml2-devel >= 2.6.0
> BuildRequires: libxslt-devel >= 1.0.0
> BuildRequires: vala
> +%if 0%{?fedora} < 30
> BuildRequires: vala-tools
> +%endif
> BuildRequires: libcurl-devel
> BuildRequires: /usr/bin/pod2man
> BuildRequires: hwdata
> @@ -34,6 +36,11 @@ Summary: Libraries, includes, etc. to compile with the
> libosinfo library
> Requires: %{name} = %{version}-%{release}
> Requires: pkgconfig
> Requires: glib2-devel
> +%if 0%{?fedora} >= 30
> +# -vala subpackage removed in F30
> +Obsoletes: libosinfo-vala < 1.3.0-3
> +Provides: libosinfo-vala = %{version}-%{release}
> +%endif
>
> %description devel
> libosinfo is a library that allows virtualization provisioning tools to
> @@ -42,6 +49,7 @@ combination.
>
> Libraries, includes, etc. to compile with the libosinfo library
>
> +%if 0%{?fedora} < 30
> %package vala
> Summary: Vala bindings
> Requires: %{name} = %{version}-%{release}
> @@ -52,6 +60,7 @@ determine the optimal device settings for a
> hypervisor/operating system
> combination.
>
> This package provides the Vala bindings for libosinfo library.
> +%endif
>
> %prep
> %setup -q
> @@ -101,7 +110,12 @@ fi
> %{_datadir}/gir-1.0/Libosinfo-1.0.gir
> %{_datadir}/gtk-doc/html/Libosinfo
>
> +%if 0%{?fedora} < 30
> %files vala
> +%else
> +%dir %{_datadir}/vala
> +%dir %{_datadir}/vala/vapi
> +%endif
> %{_datadir}/vala/vapi/libosinfo-1.0.vapi
>
> %changelog
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 4/7] spec: Add "BuildRequires: gcc"
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:52AM +0100, Fabiano Fidêncio wrote:
> Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
>
> Signed-off-by: Fabiano Fidêncio
> ---
> libosinfo.spec.in | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 648b56e..6aae7d7 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -8,6 +8,7 @@ License: LGPLv2+
> Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: https://libosinfo.org/
> +BuildRequires: gcc
> BuildRequires: gettext-devel
> BuildRequires: glib2-devel
> BuildRequires: libxml2-devel >= 2.6.0
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 3/7] mingw, spec: Remove obsolete Group tag
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:51AM +0100, Fabiano Fidêncio wrote:
> This commit brings upstream the changes done on Fedora on
> 61fea0d48407c0ee,
>
> References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
>
> Signed-off-by: Fabiano Fidêncio
> ---
> libosinfo.spec.in | 3 ---
> mingw-libosinfo.spec.in | 1 -
> 2 files changed, 4 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 8dc4d2b..648b56e 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -5,7 +5,6 @@ Name: libosinfo
> Version: @VERSION@
> Release: 1%{?dist}
> License: LGPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> URL: https://libosinfo.org/
> @@ -31,7 +30,6 @@ combination.
>
> %package devel
> Summary: Libraries, includes, etc. to compile with the libosinfo library
> -Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
> Requires: pkgconfig
> Requires: glib2-devel
> @@ -45,7 +43,6 @@ Libraries, includes, etc. to compile with the libosinfo
> library
>
> %package vala
> Summary: Vala bindings
> -Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
>
> %description vala
> diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
> index 35ed983..e99885c 100644
> --- a/mingw-libosinfo.spec.in
> +++ b/mingw-libosinfo.spec.in
> @@ -5,7 +5,6 @@ Version: @VERSION@
> Release: 1%{?dist}
> Summary: MinGW Windows port of a library for managing OS information for
> virtualization
> License: LGPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
> URL: https://libosinfo.org/
>
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 2/7] spec: Remove needless use of %defattr
Related to
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_permissions
Reviewed-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:37:50AM +0100, Fabiano Fidêncio wrote:
> This commit is bringing upstream the change done on Fedora on
> 4a678b2f4d59,
>
> Signed-off-by: Fabiano Fidêncio
> ---
> libosinfo.spec.in | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index 57f8d94..8dc4d2b 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -82,7 +82,6 @@ fi
> %ldconfig_scriptlets
>
> %files -f %{name}.lang
> -%defattr(-, root, root)
> %doc AUTHORS ChangeLog COPYING.LIB NEWS README
> %{_bindir}/osinfo-detect
> %{_bindir}/osinfo-query
> @@ -94,7 +93,6 @@ fi
> %{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
>
> %files devel
> -%defattr(-, root, root)
> %doc examples/demo.js
> %doc examples/demo.py
> %{_libdir}/%{name}-1.0.so
> @@ -106,7 +104,6 @@ fi
> %{_datadir}/gtk-doc/html/Libosinfo
>
> %files vala
> -%defattr(-, root, root)
> %{_datadir}/vala/vapi/libosinfo-1.0.vapi
>
> %changelog
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [libosinfo PATCH 1/7] spec: Switch to %ldconfig_scriptlets
On Tue, Mar 05, 2019 at 10:37:49AM +0100, Fabiano Fidêncio wrote:
> This commit is bringing upstream the change done on Fedora on
> af0ce7aab60e.
Feature is documented at
https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets
I'm not sure el7 will have it, but I don't know what we aim to support
with this spec file.
Reviewed-by: Christophe Fergeau
>
> Signed-off-by: Fabiano Fidêncio
> ---
> libosinfo.spec.in | 7 +--
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/libosinfo.spec.in b/libosinfo.spec.in
> index fd7e55c..57f8d94 100644
> --- a/libosinfo.spec.in
> +++ b/libosinfo.spec.in
> @@ -79,12 +79,7 @@ then
>exit 1
> fi
>
> -%clean
> -rm -fr %{buildroot}
> -
> -%post -p /sbin/ldconfig
> -
> -%postun -p /sbin/ldconfig
> +%ldconfig_scriptlets
>
> %files -f %{name}.lang
> %defattr(-, root, root)
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH 3/4] mingw, spec: Remove obsolete Group tag
Acked-by: Christophe Fergeau
On Tue, Mar 05, 2019 at 10:42:28AM +0100, Fabiano Fidêncio wrote:
> References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
And « The Group: tag is not required in any live Fedora or EPEL release.
RHEL5 did need it, but EPEL5 did not as it was supplied automatically
via magic in the epel-rpm-macros package. The Packaging Guidelines have
indicated that the Group: tag should not be used since March of 2017. »
might be worth quoting in the log.
>
> Signed-off-by: Fabiano Fidêncio
> ---
> mingw-osinfo-db-tools.spec.in | 1 -
> osinfo-db-tools.spec.in | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index 14e275c..2724257 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -5,7 +5,6 @@ Version: @VERSION@
> Release: 1%{?dist}%{?extra_release}
> Summary: MinGW Windows port of a library for managing OS information for
> virtualization
> License: LGPLv2+
> -Group: Development/Libraries
> Source:
> https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
> URL: https://libosinfo.org
>
> diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
> index c1b0659..7a12e85 100644
> --- a/osinfo-db-tools.spec.in
> +++ b/osinfo-db-tools.spec.in
> @@ -5,7 +5,6 @@ Name: osinfo-db-tools
> Version: @VERSION@
> Release: 1%{?dist}%{?extra_release}
> License: GPLv2+
> -Group: Development/Libraries
> Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
> URL: https://libosinfo.org
> BuildRequires: gcc
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang macro
On Tue, Mar 05, 2019 at 10:42:26AM +0100, Fabiano Fidêncio wrote:
> Signed-off-by: Fabiano Fidêncio
> ---
> mingw-osinfo-db-tools.spec.in | 10 ++
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
> index 486492f..14e275c 100644
> --- a/mingw-osinfo-db-tools.spec.in
> +++ b/mingw-osinfo-db-tools.spec.in
> @@ -74,22 +74,24 @@ information about operating systems for use with
> virtualization
> rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
> rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
>
> -%files -n mingw32-osinfo-db-tools
> +%find_lang osinfo-db-tools
> +grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-db-tools.lang
> +grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-db-tools.lang
Why not %mingw_find_lang ?
> +
> +%files -n mingw32-osinfo-db-tools -f mingw32-osinfo-db-tools.lang
> %doc AUTHORS ChangeLog NEWS README
> %license COPYING
> %{mingw32_bindir}/osinfo-db-export.exe
> %{mingw32_bindir}/osinfo-db-import.exe
> %{mingw32_bindir}/osinfo-db-path.exe
> %{mingw32_bindir}/osinfo-db-validate.exe
> -%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
>
> -%files -n mingw64-osinfo-db-tools
> +%files -n mingw64-osinfo-db-tools -f mingw64-osinfo-db-tools.lang
> %doc AUTHORS ChangeLog NEWS README
> %license COPYING
> %{mingw64_bindir}/osinfo-db-export.exe
> %{mingw64_bindir}/osinfo-db-import.exe
> %{mingw64_bindir}/osinfo-db-path.exe
> %{mingw64_bindir}/osinfo-db-validate.exe
> -%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
>
> %changelog
> --
> 2.20.1
>
> ___
> Libosinfo mailing list
> Libosinfo@redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
signature.asc
Description: PGP signature
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/4] treeinfo data fixes
On Fri, 2019-03-01 at 15:54 -0500, Cole Robinson wrote: > I wrote a script which iterates over the database and pulls out any > URLs that have associated metadata, then passes > those > URLs to osinfo_tree_create_from_location + osinfo_guess_os_from_tree, > to ensure that we detect the URL as the same OS that it's listed > with. > I'll attach the script in a follow up mail. > > This series fixes the issues the script discovered. Although I agree with Pino's comments, I don't think this series should be blocked till we have all the Fedora versions anchored. Reviewed-by: Fabiano Fidêncio Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
On Tue, 2019-03-05 at 13:22 +0100, Fabiano Fidêncio wrote: > On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: > > This series adds: > > > > * centos5 entries > > * centos6 data > > * scientificlinux 5.X > > * scientificlinux 6.X > > * scientificlinux 7.X > > > > No iso data is added, just URLs. I'm trying to get osinfo-db to > > have > > all the treeinfo coverage that virt-install has. > > Cole, in the general the series look good (apart from one change that > has to be for "Add scientificlinux-7.X". > > There's one thing that I'm interested to know, though: > - Is x.y considered EOL whenever x.(y+1) is released? I mean, will > 7.6 > be considered EOL whenever 7.7 is released? If so, we'd also have to > add the EOL to the 7.x entries. > > Anyways, for patches #1 to #5: > Reviewed-by: Fabiano Fidêncio Actually, let me take my "Reviewed-by" back. Please, take a look at 5cac22bc68[0]. There, the commit message states: centos: Remove URLs pointing to vault.centos.org As vault.centos.org doesn't keep any ISO anymore, let's just remove them from our db. Along with the URLs removal, let's remove together the tree's as those can't be accessed without a valid URL. Removing all the vault.centos.org URLs matches with the recommendation given by CentOS folks in #centos-devel: "so in short, if some program links to vault, it's most likely not a good idea and may not even work" [0]: https://gitlab.com/libosinfo/osinfo-db/commit/5cac22bc6852d56988ff4be090551c5ec2f3f108 So, I guess the path to take is to drop #1 and #3. Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db] data: Remove hard tabs
On Sat, 2019-03-02 at 16:09 -0500, Cole Robinson wrote: > Most XML files are free of hard tabs, but some aren't, and it creates > weird visual indents in git diffs. > > Let's standardize on _not_ using hard tabs > > Signed-off-by: Cole Robinson Reviewed-by: Fabiano Fidêncio Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [PATCH osinfo-db 0/6] centos and scientific linux
On Fri, 2019-03-01 at 18:41 -0500, Cole Robinson wrote: > This series adds: > > * centos5 entries > * centos6 data > * scientificlinux 5.X > * scientificlinux 6.X > * scientificlinux 7.X > > No iso data is added, just URLs. I'm trying to get osinfo-db to have > all the treeinfo coverage that virt-install has. Cole, in the general the series look good (apart from one change that has to be for "Add scientificlinux-7.X". There's one thing that I'm interested to know, though: - Is x.y considered EOL whenever x.(y+1) is released? I mean, will 7.6 be considered EOL whenever 7.7 is released? If so, we'd also have to add the EOL to the 7.x entries. Anyways, for patches #1 to #5: Reviewed-by: Fabiano Fidêncio [snip] Best Regards, -- Fabiano Fidêncio ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db-tools PATCH 0/4] spec files changes
On Tuesday, 5 March 2019 10:42:25 CET Fabiano Fidêncio wrote: > Let's update our specfiles according to some changes already done > downstream (Fedora's dist-git). > > The changes that are not on Fedora yet, will be pushed there after those > patches get approved. > > Fabiano Fidêncio (4): > mingw: Use %find_lang macro > spec: Add "BuildRequires: gcc" > mingw,spec: Remove obsolete Group tag > mingw,spec: Fix the Source URL ACK patches #2 to #4. -- Pino Toscano signature.asc Description: This is a digitally signed message part. ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
Re: [Libosinfo] [osinfo-db PATCH 0/2] spec file changes
On Tuesday, 5 March 2019 10:39:41 CET Fabiano Fidêncio wrote: > Let's update our specfiles according to some changes already done > downstream (Fedora's dist-git). > > The changes that are not on Fedora yet, will be pushed there after those > patches get approved. > > Fabiano Fidêncio (2): > spec: Fix the Source URL > spec: Remove obsolete Group tag ACK series. -- Pino Toscano signature.asc Description: This is a digitally signed message part. ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH 0/4] spec files changes
Let's update our specfiles according to some changes already done downstream (Fedora's dist-git). The changes that are not on Fedora yet, will be pushed there after those patches get approved. Fabiano Fidêncio (4): mingw: Use %find_lang macro spec: Add "BuildRequires: gcc" mingw,spec: Remove obsolete Group tag mingw,spec: Fix the Source URL mingw-osinfo-db-tools.spec.in | 13 +++-- osinfo-db-tools.spec.in | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) -- 2.20.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH 4/4] mingw, spec: Fix the Source URL
https://releases.pagure.org/libosinfo/... instead of
https://releases.pagure.io/libosinfo/...
Signed-off-by: Fabiano Fidêncio
---
mingw-osinfo-db-tools.spec.in | 2 +-
osinfo-db-tools.spec.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 2724257..96879a3 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -5,7 +5,7 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Summary: MinGW Windows port of a library for managing OS information for
virtualization
License: LGPLv2+
-Source: https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/osinfo-db-tools-%{version}.tar.gz
URL: https://libosinfo.org
BuildArch: noarch
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index 7a12e85..f0a5fcc 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -5,7 +5,7 @@ Name: osinfo-db-tools
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: GPLv2+
-Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.gz
URL: https://libosinfo.org
BuildRequires: gcc
BuildRequires: gettext-devel
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH 3/4] mingw, spec: Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
Signed-off-by: Fabiano Fidêncio
---
mingw-osinfo-db-tools.spec.in | 1 -
osinfo-db-tools.spec.in | 1 -
2 files changed, 2 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 14e275c..2724257 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -5,7 +5,6 @@ Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Summary: MinGW Windows port of a library for managing OS information for
virtualization
License: LGPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/osinfo-db-tools-%{version}.tar.gz
URL: https://libosinfo.org
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index c1b0659..7a12e85 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -5,7 +5,6 @@ Name: osinfo-db-tools
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
License: GPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
URL: https://libosinfo.org
BuildRequires: gcc
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH 1/4] mingw: Use %find_lang macro
Signed-off-by: Fabiano Fidêncio
---
mingw-osinfo-db-tools.spec.in | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mingw-osinfo-db-tools.spec.in b/mingw-osinfo-db-tools.spec.in
index 486492f..14e275c 100644
--- a/mingw-osinfo-db-tools.spec.in
+++ b/mingw-osinfo-db-tools.spec.in
@@ -74,22 +74,24 @@ information about operating systems for use with
virtualization
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
-%files -n mingw32-osinfo-db-tools
+%find_lang osinfo-db-tools
+grep "%{mingw32_datadir}" osinfo-db-tools.lang > mingw32-osinfo-db-tools.lang
+grep "%{mingw64_datadir}" osinfo-db-tools.lang > mingw64-osinfo-db-tools.lang
+
+%files -n mingw32-osinfo-db-tools -f mingw32-osinfo-db-tools.lang
%doc AUTHORS ChangeLog NEWS README
%license COPYING
%{mingw32_bindir}/osinfo-db-export.exe
%{mingw32_bindir}/osinfo-db-import.exe
%{mingw32_bindir}/osinfo-db-path.exe
%{mingw32_bindir}/osinfo-db-validate.exe
-%{mingw32_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
-%files -n mingw64-osinfo-db-tools
+%files -n mingw64-osinfo-db-tools -f mingw64-osinfo-db-tools.lang
%doc AUTHORS ChangeLog NEWS README
%license COPYING
%{mingw64_bindir}/osinfo-db-export.exe
%{mingw64_bindir}/osinfo-db-import.exe
%{mingw64_bindir}/osinfo-db-path.exe
%{mingw64_bindir}/osinfo-db-validate.exe
-%{mingw64_datadir}/locale/*/LC_MESSAGES/osinfo-db-tools.mo
%changelog
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 2/2] spec: Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
Signed-off-by: Fabiano Fidêncio
---
osinfo-db.spec.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/osinfo-db.spec.in b/osinfo-db.spec.in
index 1d6a549..046be52 100644
--- a/osinfo-db.spec.in
+++ b/osinfo-db.spec.in
@@ -5,7 +5,6 @@ Name: osinfo-db
Version: @VERSION@
Release: 1%{?dist}
License: GPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
URL: https://libosinfo.org/
BuildRequires: intltool
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 1/2] spec: Fix the Source URL
https://releases.pagure.org/libosinfo/... instead of
https://releases.pagure.io/libosinfo/...
Signed-off-by: Fabiano Fidêncio
---
osinfo-db.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osinfo-db.spec.in b/osinfo-db.spec.in
index 375b2f9..1d6a549 100644
--- a/osinfo-db.spec.in
+++ b/osinfo-db.spec.in
@@ -6,7 +6,7 @@ Version: @VERSION@
Release: 1%{?dist}
License: GPLv2+
Group: Development/Libraries
-Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.xz
+Source: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
URL: https://libosinfo.org/
BuildRequires: intltool
BuildRequires: osinfo-db-tools
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db-tools PATCH 2/4] spec: Add "BuildRequires: gcc"
This change is bringing upstream the changes done on Fedora on
5195c8b989be.
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
Signed-off-by: Fabiano Fidêncio
---
osinfo-db-tools.spec.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/osinfo-db-tools.spec.in b/osinfo-db-tools.spec.in
index e4bbfb2..c1b0659 100644
--- a/osinfo-db-tools.spec.in
+++ b/osinfo-db-tools.spec.in
@@ -8,6 +8,7 @@ License: GPLv2+
Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/%{name}-%{version}.tar.gz
URL: https://libosinfo.org
+BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [osinfo-db PATCH 0/2] spec file changes
Let's update our specfiles according to some changes already done downstream (Fedora's dist-git). The changes that are not on Fedora yet, will be pushed there after those patches get approved. Fabiano Fidêncio (2): spec: Fix the Source URL spec: Remove obsolete Group tag osinfo-db.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.20.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 5/7] spec: Use standard vala packaging pattern where vapi files are in -devel
This commit brings upstream the changes done on Fedora on
42b96ea66d7b3e.
Signed-off-by: Fabiano Fidêncio
---
libosinfo.spec.in | 14 ++
1 file changed, 14 insertions(+)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 6aae7d7..3cf73ff 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -14,7 +14,9 @@ BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
BuildRequires: libxslt-devel >= 1.0.0
BuildRequires: vala
+%if 0%{?fedora} < 30
BuildRequires: vala-tools
+%endif
BuildRequires: libcurl-devel
BuildRequires: /usr/bin/pod2man
BuildRequires: hwdata
@@ -34,6 +36,11 @@ Summary: Libraries, includes, etc. to compile with the
libosinfo library
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: glib2-devel
+%if 0%{?fedora} >= 30
+# -vala subpackage removed in F30
+Obsoletes: libosinfo-vala < 1.3.0-3
+Provides: libosinfo-vala = %{version}-%{release}
+%endif
%description devel
libosinfo is a library that allows virtualization provisioning tools to
@@ -42,6 +49,7 @@ combination.
Libraries, includes, etc. to compile with the libosinfo library
+%if 0%{?fedora} < 30
%package vala
Summary: Vala bindings
Requires: %{name} = %{version}-%{release}
@@ -52,6 +60,7 @@ determine the optimal device settings for a
hypervisor/operating system
combination.
This package provides the Vala bindings for libosinfo library.
+%endif
%prep
%setup -q
@@ -101,7 +110,12 @@ fi
%{_datadir}/gir-1.0/Libosinfo-1.0.gir
%{_datadir}/gtk-doc/html/Libosinfo
+%if 0%{?fedora} < 30
%files vala
+%else
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%endif
%{_datadir}/vala/vapi/libosinfo-1.0.vapi
%changelog
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 6/7] mingw: Use %find_Lang macro
Signed-off-by: Fabiano Fidêncio
---
mingw-libosinfo.spec.in | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index e99885c..14b4c60 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -89,7 +89,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/man
rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
-%files -n mingw32-libosinfo
+%find_lang osinfo-db-tools
+grep "%{mingw32_datadir}" libosinfo.lang > mingw32-libosinfo.lang
+grep "%{mingw64_datadir}" libosinfo.lang > mingw64-libosinfo.lang
+
+%files -n mingw32-libosinfo -f mingw32-libosinfo.lang
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{mingw32_bindir}/osinfo-detect.exe
%{mingw32_bindir}/osinfo-install-script.exe
@@ -103,9 +107,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%dir %{mingw32_datadir}/libosinfo
%{mingw32_datadir}/libosinfo/usb.ids
%{mingw32_datadir}/libosinfo/pci.ids
-%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
-%files -n mingw64-libosinfo
+%files -n mingw64-libosinfo -f mingw64-libosinfo.lang
%doc AUTHORS ChangeLog COPYING.LIB NEWS README
%{mingw64_bindir}/osinfo-detect.exe
%{mingw64_bindir}/osinfo-install-script.exe
@@ -119,6 +122,5 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%dir %{mingw64_datadir}/libosinfo
%{mingw64_datadir}/libosinfo/usb.ids
%{mingw64_datadir}/libosinfo/pci.ids
-%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
%changelog
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 1/7] spec: Switch to %ldconfig_scriptlets
This commit is bringing upstream the change done on Fedora on
af0ce7aab60e.
Signed-off-by: Fabiano Fidêncio
---
libosinfo.spec.in | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index fd7e55c..57f8d94 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -79,12 +79,7 @@ then
exit 1
fi
-%clean
-rm -fr %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files -f %{name}.lang
%defattr(-, root, root)
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 3/7] mingw, spec: Remove obsolete Group tag
This commit brings upstream the changes done on Fedora on
61fea0d48407c0ee,
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
Signed-off-by: Fabiano Fidêncio
---
libosinfo.spec.in | 3 ---
mingw-libosinfo.spec.in | 1 -
2 files changed, 4 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 8dc4d2b..648b56e 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -5,7 +5,6 @@ Name: libosinfo
Version: @VERSION@
Release: 1%{?dist}
License: LGPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://libosinfo.org/
@@ -31,7 +30,6 @@ combination.
%package devel
Summary: Libraries, includes, etc. to compile with the libosinfo library
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: glib2-devel
@@ -45,7 +43,6 @@ Libraries, includes, etc. to compile with the libosinfo
library
%package vala
Summary: Vala bindings
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description vala
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index 35ed983..e99885c 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -5,7 +5,6 @@ Version: @VERSION@
Release: 1%{?dist}
Summary: MinGW Windows port of a library for managing OS information for
virtualization
License: LGPLv2+
-Group: Development/Libraries
Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
URL: https://libosinfo.org/
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 4/7] spec: Add "BuildRequires: gcc"
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
Signed-off-by: Fabiano Fidêncio
---
libosinfo.spec.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 648b56e..6aae7d7 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -8,6 +8,7 @@ License: LGPLv2+
Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://libosinfo.org/
+BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel >= 2.6.0
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 7/7] mingw,spec: Fix the Source URL
https://releases.pagure.org/libosinfo/... instead of
https://releases.pagure.io/libosinfo/...
Signed-off-by: Fabiano Fidêncio
---
libosinfo.spec.in | 2 +-
mingw-libosinfo.spec.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 3cf73ff..6a2f2c3 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -5,7 +5,7 @@ Name: libosinfo
Version: @VERSION@
Release: 1%{?dist}
License: LGPLv2+
-Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.gz
+Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: https://libosinfo.org/
BuildRequires: gcc
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index 14b4c60..cfcc04e 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -5,7 +5,7 @@ Version: @VERSION@
Release: 1%{?dist}
Summary: MinGW Windows port of a library for managing OS information for
virtualization
License: LGPLv2+
-Source: https://releases.pagure.io/libosinfo/libosinfo-%{version}.tar.gz
+Source: https://releases.pagure.org/libosinfo/libosinfo-%{version}.tar.gz
URL: https://libosinfo.org/
BuildArch: noarch
--
2.20.1
___
Libosinfo mailing list
Libosinfo@redhat.com
https://www.redhat.com/mailman/listinfo/libosinfo
[Libosinfo] [libosinfo PATCH 0/7] spec files changes
Let's update our specfiles according to some changes already done downstream (Fedora's dist-git). The changes that are not on Fedora yet, will be pushed there after those patches get approved. Fabiano Fidêncio (7): spec: Switch to %ldconfig_scriptlets spec: Remove needless use of %defattr mingw,spec: Remove obsolete Group tag spec: Add "BuildRequires: gcc" spec: Use standard vala packaging pattern where vapi files are in -devel mingw: Use %find_Lang macro mingw,spec: Fix the Source URL libosinfo.spec.in | 30 +- mingw-libosinfo.spec.in | 13 +++-- 2 files changed, 24 insertions(+), 19 deletions(-) -- 2.20.1 ___ Libosinfo mailing list Libosinfo@redhat.com https://www.redhat.com/mailman/listinfo/libosinfo
