Accepting request 52456 from X11:windowmanagers

Accepted submit request 52456 from user prusnak

OBS-URL: https://build.opensuse.org/request/show/52456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=28
This commit is contained in:
Ruediger Oertel 2010-11-10 17:44:23 +00:00 committed by Git OBS Bridge
commit 63deef54ba
2 changed files with 5 additions and 23 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 8 12:57:56 UTC 2010 - coolo@novell.com
- remove support for pre-9.1
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 4 18:55:54 CEST 2010 - ro@suse.de Sun Apr 4 18:55:54 CEST 2010 - ro@suse.de

View File

@ -58,21 +58,12 @@ Authors:
-------- --------
The fvwm developers <fvwm-workers@fvwm.org> The fvwm developers <fvwm-workers@fvwm.org>
%if "%(xft-config --prefix)" == "/usr"
%define _xorg7libs %_lib %define _xorg7libs %_lib
%define _xorg7bin bin %define _xorg7bin bin
%define _xorg7libs32 lib %define _xorg7libs32 lib
%define _xorg7libshare share %define _xorg7libshare share
%define _xorg7prefix /usr %define _xorg7prefix /usr
%define _xorg7mandir %_mandir %define _xorg7mandir %_mandir
%else
%define _xorg7libs X11R6/%_lib
%define _xorg7bin X11R6/bin
%define _xorg7libshare X11R6/lib
%define _xorg7libs32 X11R6/lib
%define _xorg7prefix /usr/X11R6
%define _xorg7mandir /usr/X11R6/man
%endif
%prep %prep
%setup -q -n fvwm-%{version} %setup -q -n fvwm-%{version}
@ -114,11 +105,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
# #
# default config # default config
install -d -m 755 $RPM_BUILD_ROOT/etc/X11/fvwm2 install -d -m 755 $RPM_BUILD_ROOT/etc/X11/fvwm2
%if "%(xft-config --prefix)" == "/usr"
install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc
%else
install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/X11/fvwm2/system.fvwm2rc
%endif
# #
# some extra utils # some extra utils
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
@ -186,15 +173,5 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils
%{_xorg7mandir}/man1/* %{_xorg7mandir}/man1/*
%{_datadir}/xsessions/*desktop %{_datadir}/xsessions/*desktop
%if "%(xft-config --prefix)" == "/usr/X11R6"
%dir %{_xorg7prefix}/share/locale/ar
%dir %{_xorg7prefix}/share/locale/ar/LC_MESSAGES
%dir %{_xorg7prefix}/share/locale/de
%dir %{_xorg7prefix}/share/locale/de/LC_MESSAGES
%dir %{_xorg7prefix}/share/locale/fr
%dir %{_xorg7prefix}/share/locale/fr/LC_MESSAGES
%dir %{_xorg7prefix}/share/locale/zh_CN
%dir %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES
%endif
%changelog %changelog