Accepting request 81913 from home:TheBlackCat:branches:system:install:head

Resubmit.  Fixed conflict

OBS-URL: https://build.opensuse.org/request/show/81913
OBS-URL: https://build.opensuse.org/package/show/system:install:head/gfxboot?expand=0&rev=78
This commit is contained in:
Steffen Winterfeldt 2011-09-21 13:47:24 +00:00 committed by Git OBS Bridge
parent f19411174e
commit f26b36a141
2 changed files with 100 additions and 97 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 12 12:18:12 UTC 2011 - toddrme2178@gmail.com
- Added check for duplicate files (fix for RPMLINT warning)
- Added branding provides (fix for RPMLINT warning)
- Modified summaries (fix for RPMLINT warning)
- Cleaned up spec file formatting
-------------------------------------------------------------------
Fri Sep 2 16:37:56 CEST 2011 - snwint@suse.de

View File

@ -15,120 +15,122 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gfxboot
BuildRequires: freetype2-devel fribidi libxslt nasm perl-HTML-Parser sgml-skel w3m xmlto
ExclusiveArch: %ix86 x86_64
License: GPLv2+
Group: System/Boot
Recommends: gfxboot-theme >= 4
Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser
AutoReqProv: on
Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX
Version: 4.4.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gfxboot-4.4.5.tar.bz2
License: GPLv2+
Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX
Url: http://en.opensuse.org/SDB:Gfxboot
Group: System/Boot
Source: %{name}-%{version}.tar.bz2
Source6: examples.tar.bz2
Source1: KDE.tar.bz2
Source2: openSUSE.tar.bz2
Source3: SLED.tar.bz2
Source4: SLES.tar.bz2
Source5: upstream.tar.bz2
Source6: examples.tar.bz2
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: fribidi
BuildRequires: libxslt
BuildRequires: nasm
BuildRequires: perl-HTML-Parser
BuildRequires: sgml-skel
BuildRequires: w3m
BuildRequires: xmlto
Requires: coreutils
Requires: cpio
Requires: dosfstools
Requires: master-boot-code
Requires: mktemp
Requires: mtools
Requires: perl-HTML-Parser
Recommends: %{name}-theme >= 4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
%perl_requires
%description
Tools to configure your bootloader graphics.
Tools to configure the graphics for your GRUB, LILO or SYSLINUX bootloader.
%package devel
License: GPLv2+
Summary: Tools for creating a graphical boot logo
Group: Development/Libraries/C and C++
Requires: %name = %version perl-HTML-Parser
Requires: %{name} = %{version}
%description devel
Here you find the necessary programs to create your own graphical boot
logo. The logo can be used with grub, lilo or syslinux.
logo. The logo can be used with GRUB, LILO or SYSLINUX.
%package branding-upstream
License: GPLv2+
Supplements: packageand(gfxboot:branding-upstream)
Provides: gfxboot-theme
Summary: gfxboot upstream theme
AutoReqProv: on
Summary: Graphical bootloader upstream theme
Group: System/Boot
PreReq: gfxboot >= 4
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-upstream
upstream theme for gfxboot (bootloader graphics).
%package branding-openSUSE
License: GPLv2+
Supplements: packageand(gfxboot:branding-openSUSE)
Provides: gfxboot-theme
Obsoletes: bootloader-theme-SUSELinux-Prof
Summary: gfxboot openSUSE theme
AutoReqProv: on
Summary: Graphical bootloader openSUSE theme
Group: System/Boot
PreReq: gfxboot >= 4
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-openSUSE)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Obsoletes: bootloader-theme-SUSELinux-Prof < %{version}
Provides: bootloader-theme-SUSELinux-Prof = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-openSUSE
openSUSE theme for gfxboot (bootloader graphics).
%package branding-SLES
License: GPLv2+
Supplements: packageand(gfxboot:branding-SLES)
Provides: gfxboot-theme
Obsoletes: bootloader-theme-SLES
Summary: gfxboot SLES theme
AutoReqProv: on
Summary: Graphical bootloader SLES theme
Group: System/Boot
PreReq: gfxboot >= 4
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-SLES)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Obsoletes: bootloader-theme-SLES < %{version}
Provides: bootloader-theme-SLES = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-SLES
SLES theme for gfxboot (bootloader graphics).
%package branding-SLED
License: GPLv2+
Supplements: packageand(gfxboot:branding-SLED)
Provides: gfxboot-theme
Obsoletes: bootloader-theme-NLD
Summary: gfxboot SLED theme
AutoReqProv: on
Summary: Graphical bootloader SLED theme
Group: System/Boot
PreReq: gfxboot >= 4
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-SLED)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Obsoletes: bootloader-theme-NLD < %{version}
Provides: bootloader-theme-NLD = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-SLED
SLED theme for gfxboot (bootloader graphics).
%package branding-KDE
License: GPLv2+
Supplements: packageand(gfxboot:branding-KDE)
Provides: gfxboot-theme
Summary: gfxboot KDE theme
AutoReqProv: on
Summary: Graphical bootloader KDE theme
Group: System/Boot
PreReq: gfxboot >= 4
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-KDE)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-KDE
KDE theme for gfxboot (bootloader graphics).
%prep
%setup
%setup -q
%setup -T -D -a 1
%setup -T -D -a 2
%setup -T -D -a 3
@ -140,83 +142,76 @@ KDE theme for gfxboot (bootloader graphics).
# fix build
export SUSE_ASNEEDED=0
make DESTDIR=%{buildroot} installsrc
make X11LIBS=/usr/X11R6/%_lib
make X11LIBS=%{_prefix}/X11R6/%{_lib}
make doc
make themes
%install
make DESTDIR=%{buildroot} install
gzip -9c doc/gfxboot.8 >gfxboot.8.gz
%make_install
gzip -9c doc/%{name}.8 >%{name}.8.gz
install -d -m 755 %{buildroot}%{_mandir}/man8
install -m 644 gfxboot.8.gz %{buildroot}%{_mandir}/man8
install -m 644 %{name}.8.gz %{buildroot}%{_mandir}/man8
mkdir %{buildroot}/boot
touch %{buildroot}/boot/message
%fdupes -s %{buildroot}%{_datadir}/%{name}/themes/
%post branding-upstream
gfxboot --update-theme upstream
%{name} --update-theme upstream
%post branding-openSUSE
gfxboot --update-theme openSUSE
%{name} --update-theme openSUSE
%post branding-SLES
gfxboot --update-theme SLES
%{name} --update-theme SLES
%post branding-SLED
gfxboot --update-theme SLED
%{name} --update-theme SLED
%post branding-KDE
gfxboot --update-theme KDE
%{name} --update-theme KDE
%clean
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
/usr/sbin/gfxboot
%doc %{_mandir}/man8/gfxboot.8.gz
%{_sbindir}/%{name}
%{_mandir}/man8/%{name}.8.gz
%dir %{_sysconfdir}/bootsplash
%dir %{_sysconfdir}/bootsplash/themes
%files devel
%defattr(-,root,root)
/usr/sbin/gfxboot-compile
/usr/sbin/gfxboot-font
/usr/sbin/gfxtest
%doc doc/gfxboot.html
%doc doc/gfxboot.txt
/usr/share/gfxboot
%{_sbindir}/%{name}-compile
%{_sbindir}/%{name}-font
%{_sbindir}/gfxtest
%doc doc/%{name}.html
%doc doc/%{name}.txt
%{_datadir}/%{name}
%files branding-upstream
%defattr(-,root,root)
%dir /etc/bootsplash
%dir /etc/bootsplash/themes
/etc/bootsplash/themes/upstream
%{_sysconfdir}/bootsplash/themes/upstream
%ghost /boot/message
%files branding-openSUSE
%defattr(-,root,root)
%dir /etc/bootsplash
%dir /etc/bootsplash/themes
/etc/bootsplash/themes/openSUSE
%{_sysconfdir}/bootsplash/themes/openSUSE
%ghost /boot/message
%files branding-SLES
%defattr(-,root,root)
%dir /etc/bootsplash
%dir /etc/bootsplash/themes
/etc/bootsplash/themes/SLES
%{_sysconfdir}/bootsplash/themes/SLES
%ghost /boot/message
%files branding-SLED
%defattr(-,root,root)
%dir /etc/bootsplash
%dir /etc/bootsplash/themes
/etc/bootsplash/themes/SLED
%{_sysconfdir}/bootsplash/themes/SLED
%ghost /boot/message
%files branding-KDE
%defattr(-,root,root)
%dir /etc/bootsplash
%dir /etc/bootsplash/themes
/etc/bootsplash/themes/KDE
%{_sysconfdir}/bootsplash/themes/KDE
%ghost /boot/message
%changelog