[xbill] Added gcc dependency Added AppData file Spec file cleanup
by Andrea Musuruane
commit 569b9e44f5395fa9666430fd0aefa5196cb081d0
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Fri Aug 2 15:20:52 2019 +0200
Added gcc dependency
Added AppData file
Spec file cleanup
xbill.appdata.xml | 27 +++++++++++++++++++++++++++
xbill.spec | 53 ++++++++++++++++++++++-------------------------------
2 files changed, 49 insertions(+), 31 deletions(-)
---
diff --git a/xbill.appdata.xml b/xbill.appdata.xml
new file mode 100644
index 0000000..046851a
--- /dev/null
+++ b/xbill.appdata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Andrea Musuruane <musuruan(a)gmail.com -->
+<component type="desktop">
+ <id>xbill.desktop</id>
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+ <project_license>GPL+</project_license>
+ <name>XBill</name>
+ <summary>Stop Bill from loading his OS into all the computers</summary>
+ <description>
+ <p>
+ Ever get the feeling that nothing is going right? You're a sysadmin,
+ and someone's trying to destroy your computers. The little people
+ running around the screen are trying to infect your computers with
+ Wingdows [TM], a virus cleverly designed to resemble a popular
+ operating system. Your objective is to click the mouse on them,
+ ending the potential threat. If one of the people reaches a
+ computer, it will attempt to replace your operating system with the
+ virus it carries. It will then attempt to run off the screen with
+ your vital software.
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://www.xbill.org</url>
+</component>
diff --git a/xbill.spec b/xbill.spec
index 97bbff8..19872ef 100644
--- a/xbill.spec
+++ b/xbill.spec
@@ -1,13 +1,13 @@
Name: xbill
Version: 2.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Stop Bill from loading his OS into all the computers
-Group: Amusements/Games
License: GPL+
URL: http://www.xbill.org/
Source0: http://www.xbill.org/download/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
+Source2: %{name}.appdata.xml
# Gentoo 201214
Patch0: %{name}-2.1-gtk2.patch
# Debian
@@ -15,13 +15,13 @@ Patch1: %{name}-2.1-hurd_logos.patch
# Andrea Musuruane
Patch2: %{name}-2.1-score.patch
Patch3: %{name}-2.1-dropsgid.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gcc
BuildRequires: libtool
-
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
+BuildRequires: libappstream-glib
Requires: hicolor-icon-theme
@@ -45,52 +45,37 @@ and it is very popular at Red Hat.
%build
autoreconf
-%configure --disable-motif \
+%configure \
+ --disable-motif \
--localstatedir=%{_localstatedir}/games
-make %{?_smp_mflags}
+%make_build
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
#install man page
install -d %{buildroot}%_mandir/man6
-install -m 644 %{name}.6 %{buildroot}%{_mandir}/man6
+install -p -m 644 %{name}.6 %{buildroot}%{_mandir}/man6
# install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor '' \
+install -d %{buildroot}%{_datadir}/applications
+desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
# install icon
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
convert -resize x48 %{name}.gif \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+# install AppData file
+install -d %{buildroot}%{_datadir}/metainfo
+install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
%files
-%defattr(-,root,root,-)
%attr(2755,root,games) %{_bindir}/%{name}
%{_localstatedir}/games/%{name}
%attr(0664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}/scores
@@ -98,10 +83,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man6/%{name}.6*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
+%{_datadir}/metainfo/%{name}.appdata.xml
%doc ChangeLog README
%changelog
+* Fri Aug 02 2019 Andrea Musuruane <musuruan(a)gmail.com> - 2.1-13
+- Added gcc dependency
+- Added AppData file
+- Spec file cleanup
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
4 years, 9 months
[nvidia-xconfig/el7: 3/3] Merge branch 'master' into el7
by Leigh Scott
commit b3e7cd46ccdb44c605920fc1ed426c4d9e15ff40
Merge: 49d526b df95e4e
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Aug 1 21:15:10 2019 +0100
Merge branch 'master' into el7
nvidia-xconfig.spec | 8 +++++++-
sources | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
4 years, 9 months
[nvidia-xconfig/f29: 3/3] Merge branch 'master' into f29
by Leigh Scott
commit 54600f6236e372d04828c887d5bab037e0100141
Merge: 9690023 df95e4e
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Aug 1 21:14:58 2019 +0100
Merge branch 'master' into f29
nvidia-xconfig.spec | 8 +++++++-
sources | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
4 years, 9 months
[nvidia-xconfig/f30: 3/3] Merge branch 'master' into f30
by Leigh Scott
commit 79f5c71821b12484ebfd7cca33ae7eafa7bbaff1
Merge: 9690023 df95e4e
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Aug 1 21:14:38 2019 +0100
Merge branch 'master' into f30
nvidia-xconfig.spec | 8 +++++++-
sources | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
4 years, 9 months
