X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fvwm2.spec;h=c8aa16124c8c22ff6063e212718a8a03fb57c484;hb=9ee4e8e42b0e1202ddf971a1e75dccec931f5f7f;hp=4c525945c68504a2637b192f70c80d5aae4f0546;hpb=578ff887c99b4d587aa2e07ed5bc96782fc5ddcf;p=packages%2Ffvwm2.git diff --git a/fvwm2.spec b/fvwm2.spec index 4c52594..c8aa161 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -5,9 +5,8 @@ %bcond_without stroke # without mouse strokes (gestures) support %bcond_without xft # without Xft (1 or 2) support %bcond_with fribidi # with bidirectional text support -%bcond_with gnome # with gnome-libs +%bcond_with gnome # with gnome-libs and wm-properties %bcond_with rplay # with internal sound support (through rplay) -# %include /usr/lib/rpm/macros.perl Summary: An improved version of the FVWM X-based window manager Summary(de.UTF-8): F(?) Virtual Window Manager @@ -19,47 +18,54 @@ Summary(pt_BR.UTF-8): Gerenciador de janelas semelhante ao mwm Summary(ru.UTF-8): Виртуальный оконный менеджер F(?) Summary(tr.UTF-8): Yaygın bir pencere denetleyicisi Name: fvwm2 -Version: 2.5.21 +Version: 2.6.5 Release: 1 License: GPL Group: X11/Window Managers Source0: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-%{version}.tar.bz2 -# Source0-md5: c11efef91420e686d54f772e7162e879 -Source1: fvwm-2.0.46.icons.tar.gz -# Source1-md5: 8d81420cf49442fca4bb2b61ae54eeb9 -Source2: %{name}.desktop -Source3: %{name}-system.%{name}rc.tar.gz -# Source3-md5: 22c1f6c5ab4bd84376daa37debd3e889 -Source4: %{name}.RunWM -Source5: mozilla.xpm -Source6: %{name}-xsession.desktop +# Source0-md5: 090ba4e0c517e8b94f71317951530f69 +Source1: ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm_icons-20070101.tar.bz2 +# Source1-md5: 2ab5ee60a96830af23a43855e33afc7d +Source2: %{name}-system.%{name}rc.tar.gz +# Source2-md5: 22c1f6c5ab4bd84376daa37debd3e889 +Source3: %{name}.RunWM +Source4: %{name}-xsession.desktop +Source5: %{name}.desktop +Source6: mozilla.xpm Patch0: %{name}-paths.patch Patch1: FvwmPager.patch Patch2: %{name}-locale_names.patch Patch3: %{name}-varia.patch +Patch5: %{name}-xft2-link.patch +Patch7: %{name}-aclocal.patch +Patch8: %{name}-format-string.patch URL: http://www.fvwm.org/ BuildRequires: autoconf BuildRequires: automake %{?with_fribidi:BuildRequires: fribidi-devel} %{?with_gnome:BuildRequires: gnome-libs-devel} BuildRequires: gtk+-devel -BuildRequires: libpng-devel +BuildRequires: libpng-devel >= 1.4 %{?with_stroke:BuildRequires: libstroke-devel} +BuildRequires: pkgconfig BuildRequires: readline-devel >= 4.2 %{?with_rplay:BuildRequires: rplay-devel} BuildRequires: rpm-perlprov %{?with_xft:BuildRequires: xorg-lib-libXft-devel} BuildRequires: xorg-lib-libXpm-devel BuildRequires: xorg-lib-libXt-devel +BuildRequires: librsvg-devel +BuildRequires: imlib-devel Requires(post): vfmg >= 0.9.95 Requires: fvwm2-icons = %{version}-%{release} Requires: m4 Requires: vfmg >= 0.9.18-2 Obsoletes: fvwm95 +Conflicts: filesystem < 3.0-20 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sysconfdir /etc/X11/fvwm2 -%define _wmpropsdir /usr/share/wm-properties +%define _wmpropsdir /usr/share/gnome/wm-properties %description FVWM2 (the F stands for whatever you want, but the VWM stands for @@ -130,11 +136,14 @@ fvwm-perllib, FvwmPerl and dependent modules. fvwm-perllib, FvwmPerl i zależne moduły. %prep -%setup -n fvwm-%{version} -q -a1 -a3 +%setup -n fvwm-%{version} -q -a1 -a2 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch5 -p1 +%patch7 -p1 +%patch8 -p1 mv -f po/FvwmScript.sv{_SE,}.po mv -f po/FvwmTaskBar.sv{_SE,}.po @@ -152,7 +161,6 @@ rm -f missing --disable-command-log \ %{!?with_fribidi:--disable-bidi} \ %{!?with_xft:--disable-xft} \ - --enable-multibyte \ --enable-shape \ --enable-sm \ %{?with_gnome:--with-gnome}%{!?with_gnome:--without-gnome} \ @@ -165,33 +173,34 @@ rm -f missing --with-iconv-library=no \ --without-termcap-library -%{__make} +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT install -d \ - $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig/wmstyle,%{_wmpropsdir}} \ + $RPM_BUILD_ROOT{%{_sysconfdir},%{_wmpropsdir}} \ $RPM_BUILD_ROOT{%{_datadir}/{locale,xsessions},%{_pixmapsdir}/mini} install system.fvwm2rc $RPM_BUILD_ROOT%{_sysconfdir}/system.fvwm2rc install fvwm2.menu.m4 $RPM_BUILD_ROOT%{_sysconfdir} -install icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir} +install fvwm_icons-20070101/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir} -mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini-*.xpm \ +mv $RPM_BUILD_ROOT%{_pixmapsdir}/mini.*.xpm \ $RPM_BUILD_ROOT%{_pixmapsdir}/mini # Conflicts with wmmaker mv $RPM_BUILD_ROOT%{_pixmapsdir}/xv{,-fvwm}.xpm -install %{SOURCE2} $RPM_BUILD_ROOT%{_wmpropsdir} -install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh -install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir} -install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop +install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/fvwm2-session +install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop +%{?with_gnome:install %{SOURCE5} $RPM_BUILD_ROOT%{_wmpropsdir}} +install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir} + touch $RPM_BUILD_ROOT%{_sysconfdir}/fvwm2.menu2 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xpmroot.1 @@ -215,24 +224,26 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fvwm2.menu.m4 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/system.fvwm2rc %ghost %{_sysconfdir}/fvwm2.menu2 -%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh %attr(755,root,root) %{_bindir}/[!f]* %attr(755,root,root) %{_bindir}/fvwm -%attr(755,root,root) %{_bindir}/fvwm2 %attr(755,root,root) %{_bindir}/fvwm-[!p]* +%attr(755,root,root) %{_bindir}/fvwm2 +%attr(755,root,root) %{_bindir}/fvwm2-session %dir %{_libdir}/fvwm %attr(755,root,root) %{_libdir}/fvwm/Fvwm[!DGPWT]* %attr(755,root,root) %{_libdir}/fvwm/FvwmD[!e]* %attr(755,root,root) %{_libdir}/fvwm/FvwmGtk %attr(755,root,root) %{_libdir}/fvwm/FvwmP[!e]* %attr(755,root,root) %{_libdir}/fvwm/FvwmT[!a]* +%attr(755,root,root) %{_libdir}/fvwm/FvwmTalk %attr(755,root,root) %{_libdir}/fvwm/FvwmTaskBar %attr(755,root,root) %{_libdir}/fvwm/FvwmW[!i]* %attr(755,root,root) %{_libdir}/fvwm/FvwmWinList %dir %{_datadir}/fvwm %{_datadir}/fvwm/[!p]* %{_datadir}/xsessions/%{name}.desktop -%{_wmpropsdir}/fvwm2.desktop +%{_datadir}/locale/ar/LC_MESSAGES/FvwmScript.mo +%{?with_gnome:%{_wmpropsdir}/fvwm2.desktop} %{_mandir}/man1/[!Ff]*.1* %{_mandir}/man1/Fvwm[!DGPW]*.1* %{_mandir}/man1/FvwmD[!e]*.1* @@ -241,6 +252,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/FvwmWinList.1* %{_mandir}/man1/fvwm.1* %{_mandir}/man1/fvwm-[!p]*.1* +%{_mandir}/man1/fvwm2.1* +%{_mandir}/man1/FvwmGtk.1.* %files icons %defattr(644,root,root,755)