Accepting request 836561 from home:jengelh:branches:X11:Utilities

- Upgrade old RPM constructs.

OBS-URL: https://build.opensuse.org/request/show/836561
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=46
This commit is contained in:
Stefan Dirsch 2020-09-24 13:38:48 +00:00 committed by Git OBS Bridge
parent 26f3863c66
commit d4ca5bcfe5
2 changed files with 24 additions and 28 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 24 12:51:44 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Upgrade old RPM constructs.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 23 16:28:35 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Wed Sep 23 16:28:35 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -22,7 +22,7 @@
%endif %endif
Name: x11-tools Name: x11-tools
PreReq: %fillup_prereq Requires(post): %fillup_prereq
Provides: 3ddiag Provides: 3ddiag
Provides: xf86tools Provides: xf86tools
Obsoletes: 3ddiag Obsoletes: 3ddiag
@ -41,50 +41,41 @@ Source35: nvidia-pre-install
Source36: nvidia-post-uninstall Source36: nvidia-post-uninstall
Source37: i18n.template Source37: i18n.template
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Some useful tools for the X Window System. Some useful tools for the X Window System.
Authors:
--------
Stefan Dirsch <sndirsch@suse.de>
Ludwig Nussel <lnussel@suse.de>
%prep %prep
%build %build
%install %install
mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p %{buildroot}/usr/bin/
install -m 755 $RPM_SOURCE_DIR/xf86debug $RPM_BUILD_ROOT/usr/bin install -m 755 %{_sourcedir}/xf86debug %{buildroot}/usr/bin
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
mkdir -p $RPM_BUILD_ROOT/%{_distconfdir}/X11/xim.d mkdir -p %{buildroot}/%{_distconfdir}/X11/xim.d
install -m 644 $RPM_SOURCE_DIR/xim $RPM_BUILD_ROOT/%{_distconfdir}/X11 install -m 644 %{_sourcedir}/xim %{buildroot}/%{_distconfdir}/X11
install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/%{_distconfdir}/X11/xim.d install -m 644 %{_sourcedir}/none %{buildroot}/%{_distconfdir}/X11/xim.d
%else %else
mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d mkdir -p %{buildroot}/etc/X11/xim.d
install -m 644 $RPM_SOURCE_DIR/xim $RPM_BUILD_ROOT/etc/X11 install -m 644 %{_sourcedir}/xim %{buildroot}/etc/X11
install -m 644 $RPM_SOURCE_DIR/none $RPM_BUILD_ROOT/etc/X11/xim.d install -m 644 %{_sourcedir}/none %{buildroot}/etc/X11/xim.d
%endif %endif
mkdir -p $RPM_BUILD_ROOT/etc/skel mkdir -p %{buildroot}/etc/skel
install -m 644 $RPM_SOURCE_DIR/xim.template $RPM_BUILD_ROOT/etc/skel/.xim.template install -m 644 %{_sourcedir}/xim.template %{buildroot}/etc/skel/.xim.template
install -m 644 %{S:37} $RPM_BUILD_ROOT/etc/skel/.i18n install -m 644 %{S:37} %{buildroot}/etc/skel/.i18n
mkdir -p $RPM_BUILD_ROOT%{_fillupdir}/ mkdir -p %{buildroot}/%{_fillupdir}/
install -c -m 644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT%{_fillupdir}/ install -c -m 644 %{_sourcedir}/sysconfig.language-%{name} %{buildroot}/%{_fillupdir}/
mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia mkdir -p %{buildroot}/usr/lib/nvidia
install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \ install -m 755 %{_sourcedir}/nvidia-pre-install \
$RPM_BUILD_ROOT/usr/lib/nvidia/pre-install %{buildroot}/usr/lib/nvidia/pre-install
install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \ install -m 755 %{_sourcedir}/nvidia-post-uninstall \
$RPM_BUILD_ROOT/usr/lib/nvidia/post-uninstall %{buildroot}/usr/lib/nvidia/post-uninstall
%post %post
%{fillup_only -an language} %{fillup_only -an language}
%files %files
%defattr(-, root, root)
%dir /usr/lib/nvidia %dir /usr/lib/nvidia
/usr/bin/xf86debug /usr/bin/xf86debug
/usr/lib/nvidia/pre-install /usr/lib/nvidia/pre-install