|
@@ -1,8 +1,8 @@
|
|
Summary: An improved version of the FVWM window manager for X.
|
|
Summary: An improved version of the FVWM window manager for X.
|
|
Summary(ja): fvwm2 (F(?) Virtual Window Manager version 2) の日本語対応版
|
|
Summary(ja): fvwm2 (F(?) Virtual Window Manager version 2) の日本語対応版
|
|
Name: fvwm2
|
|
Name: fvwm2
|
|
-Version: 2.5.28
|
|
+Version: 2.7.0
|
|
-Release: 1%{?_dist_release}
|
|
+Release: 2%{?_dist_release}
|
|
License: GPLv2
|
|
License: GPLv2
|
|
Group: User Interface/Desktops
|
|
Group: User Interface/Desktops
|
|
Url: http://www.fvwm.org
|
|
Url: http://www.fvwm.org
|
|
@@ -19,7 +19,7 @@ Source20: fvwm.ja.po
|
|
Source21: FvwmTaskBar.ja.po
|
|
Source21: FvwmTaskBar.ja.po
|
|
Source22: FvwmScript.ja.po
|
|
Source22: FvwmScript.ja.po
|
|
Source30: Blue-Vine-theme.tar.bz2
|
|
Source30: Blue-Vine-theme.tar.bz2
|
|
-Source31: fvwm-backgrounds.tar.bz2
|
|
+Source31: fvwm2-backgrounds.tar.bz2
|
|
Source32: fvwm-system-styles.tar.bz2
|
|
Source32: fvwm-system-styles.tar.bz2
|
|
Source40: Exit.png
|
|
Source40: Exit.png
|
|
Source41: fvwm-start.png
|
|
Source41: fvwm-start.png
|
|
@@ -33,15 +33,21 @@ Patch12: fvwm-script-setup95.patch
|
|
|
|
|
|
BuildRequires: glibc-devel xorg-x11-proto-devel libXpm-devel readline-devel
|
|
BuildRequires: glibc-devel xorg-x11-proto-devel libXpm-devel readline-devel
|
|
BuildRequires: ncurses-devel perl gtk+-devel imlib-devel libXft-devel
|
|
BuildRequires: ncurses-devel perl gtk+-devel imlib-devel libXft-devel
|
|
-BuildRequires: fribidi-devel libpng-devel librsvg2-devel libSM-devel
|
|
+##BuildRequires: fribidi-devel libpng-devel librsvg2-devel libSM-devel
|
|
|
|
+BuildRequires: libpng-devel librsvg2-devel libSM-devel
|
|
BuildRequires: libxslt-devel libXrender-devel libXinerama-devel libXt-devel
|
|
BuildRequires: libxslt-devel libXrender-devel libXinerama-devel libXt-devel
|
|
|
|
+BuildRequires: libstroke-devel
|
|
|
|
+BuildRequires: gnome-libs-devel audiofile-devel esound-devel alsa-lib-devel
|
|
Requires: glibc libXpm readline
|
|
Requires: glibc libXpm readline
|
|
Requires: ncurses perl >= 5.004 gtk+ imlib libXft
|
|
Requires: ncurses perl >= 5.004 gtk+ imlib libXft
|
|
-Requires: fribidi libpng librsvg2 libSM
|
|
+##Requires: fribidi libpng librsvg2 libSM
|
|
-Requires: libxslt libXrender libXinerama libXt
|
|
+Requires: libpng librsvg2 libSM
|
|
|
|
+Requires: libxslt libXrender libXinerama libXt libstroke
|
|
Requires: Gtk-Perl zenity xsri ImageMagick w3m
|
|
Requires: Gtk-Perl zenity xsri ImageMagick w3m
|
|
|
|
+Requires: gnome-libs audiofile esound esound-libs alsa-lib
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
|
|
+
|
|
%description
|
|
%description
|
|
FVWM2 (the F stands for whatever you want, but the VWM stands for
|
|
FVWM2 (the F stands for whatever you want, but the VWM stands for
|
|
Virtual Window Manager) is an improved version of the FVWM window
|
|
Virtual Window Manager) is an improved version of the FVWM window
|
|
@@ -74,7 +80,7 @@ cp -p %{SOURCE4} sample.fvwmrc/system.fvwm2rc.ja
|
|
cp -p %{SOURCE20} %{SOURCE21} %{SOURCE22} po/
|
|
cp -p %{SOURCE20} %{SOURCE21} %{SOURCE22} po/
|
|
|
|
|
|
%build
|
|
%build
|
|
-%configure --enable-htmldoc
|
|
+%configure --enable-htmldoc --disable-bidi --disable-rplay
|
|
|
|
|
|
if [ "$SMP" != "" ]; then
|
|
if [ "$SMP" != "" ]; then
|
|
make -j$SMP "MAKE=make -j$SMP"
|
|
make -j$SMP "MAKE=make -j$SMP"
|
|
@@ -96,27 +102,29 @@ mkdir -p %{buildroot}/%{_libexecdir}/%{name}/%{version}
|
|
#----- startup script
|
|
#----- startup script
|
|
%__install %{SOURCE10} %{buildroot}/%{_bindir}/
|
|
%__install %{SOURCE10} %{buildroot}/%{_bindir}/
|
|
#----- wallpaper utility
|
|
#----- wallpaper utility
|
|
-%__install %{SOURCE12} %{buildroot}/%{_bindir}/
|
|
+%__install %{SOURCE12} %{SOURCE13} %{buildroot}%{_bindir}/
|
|
-%__install %{SOURCE13} %{buildroot}/%{_bindir}/
|
|
+####%__install %{SOURCE13} %{buildroot}/%{_bindir}/
|
|
#----- desktop session entry file
|
|
#----- desktop session entry file
|
|
-%__mkdir -p %{buildroot}/%{_sysconfdir}/X11/dm/Sessions
|
|
+%__mkdir -p %{buildroot}%{_datadir}/xsessions/
|
|
-%__install -m0644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/X11/dm/Sessions/
|
|
+%__install -m0644 %{SOURCE11} %{buildroot}%{_datadir}/xsessions/
|
|
#----- fvwm config files
|
|
#----- fvwm config files
|
|
-%__mkdir -p %{buildroot}/%{_datadir}/fvwm/Blue-Vine-theme
|
|
+%__mkdir -p %{buildroot}%{_datadir}/fvwm/Blue-Vine-theme
|
|
-%__install -m0644 Blue-Vine-theme/.fvwm2rc %{buildroot}/%{_datadir}/fvwm/Blue-Vine-theme
|
|
+%__install -m0644 Blue-Vine-theme/.fvwm2rc %{buildroot}%{_datadir}/fvwm/Blue-Vine-theme
|
|
-%__install -m0644 Blue-Vine-theme/* %{buildroot}/%{_datadir}/fvwm/Blue-Vine-theme
|
|
+%__install -m0644 Blue-Vine-theme/* %{buildroot}%{_datadir}/fvwm/Blue-Vine-theme
|
|
#----- wallpaper
|
|
#----- wallpaper
|
|
-%__mkdir -p %{buildroot}/%{_datadir}/fvwm/backgrounds
|
|
+%__mkdir -p %{buildroot}%{_datadir}/fvwm/backgrounds
|
|
-%__install -m0644 backgrounds/* %{buildroot}/%{_datadir}/fvwm/backgrounds
|
|
+%__install -m0644 fvwm2-backgrounds/* %{buildroot}%{_datadir}/fvwm/backgrounds
|
|
#----- mini icons
|
|
#----- mini icons
|
|
mkdir -p %{buildroot}%{_datadir}/icons/mini
|
|
mkdir -p %{buildroot}%{_datadir}/icons/mini
|
|
install -m 644 icons/*.xpm %{buildroot}%{_datadir}/icons/mini/
|
|
install -m 644 icons/*.xpm %{buildroot}%{_datadir}/icons/mini/
|
|
install -m 644 %{SOURCE40} %{SOURCE41} %{SOURCE42} %{buildroot}%{_datadir}/icons/mini/
|
|
install -m 644 %{SOURCE40} %{SOURCE41} %{SOURCE42} %{buildroot}%{_datadir}/icons/mini/
|
|
#----- modified styles
|
|
#----- modified styles
|
|
-mkdir %{buildroot}/%{_datadir}/fvwm/fvwm-system-styles/
|
|
+mkdir %{buildroot}%{_datadir}/fvwm/fvwm-system-styles/
|
|
-install -m 644 fvwm-system-styles/* %{buildroot}/%{_datadir}/fvwm/fvwm-system-styles/
|
|
+install -m 644 fvwm-system-styles/* %{buildroot}%{_datadir}/fvwm/fvwm-system-styles/
|
|
|
|
+
|
|
|
|
+# eliminate executable bit in %doc
|
|
|
|
+#find docs/ -type f -perm +111 | xargs -r chmod -x
|
|
|
|
|
|
-###find docs/ -type f -perm +111 | xargs -r chmod -x
|
|
|
|
|
|
|
|
%clean
|
|
%clean
|
|
rm -rf %{buildroot}
|
|
rm -rf %{buildroot}
|
|
@@ -124,23 +132,42 @@ rm -rf %{buildroot}
|
|
#-----------------------------------
|
|
#-----------------------------------
|
|
%files
|
|
%files
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
-%doc AUTHORS COPYING INSTALL INSTALL.fvwm NEWS README
|
|
+#%doc AUTHORS COPYING INSTALL INSTALL.fvwm NEWS README
|
|
-%doc docs/ANNOUNCE docs/BUGS docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/TODO
|
|
+#%doc docs/ANNOUNCE docs/BUGS docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/TODO
|
|
-%doc docs/error_codes docs/fvwm.lsm
|
|
+#%doc docs/error_codes docs/fvwm.lsm
|
|
%{_bindir}/*
|
|
%{_bindir}/*
|
|
-%{_sysconfdir}/*
|
|
+%{_datadir}/*
|
|
-%{_datadir}/fvwm/*
|
|
|
|
-%{_datadir}/locale/*
|
|
|
|
-%{_datadir}/man/*
|
|
|
|
-%{_datadir}/icons/mini/*
|
|
|
|
%{_libexecdir}/fvwm/%{version}/*
|
|
%{_libexecdir}/fvwm/%{version}/*
|
|
-%dir %{_datadir}/fvwm
|
|
+#%dir %{_libexecdir}/fvwm/%{version}
|
|
-%dir %{_libexecdir}/fvwm/%{version}
|
|
|
|
-%dir %{_datadir}/icons/mini
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Jun 4 2011 KATO Masashi <mkato@par.odn.ne.jp> 2.7.0-2
|
|
|
|
+- added BuildRequires: gnome-libs-devel audiofile-devel \
|
|
|
|
+ esound-devel alsa-lib-devel
|
|
|
|
+- added Requires: gnome-libs audiofile esound esound-libs alsa-lib
|
|
|
|
+
|
|
|
|
+* Mon May 16 2011 KATO Masashi <mkato@par.odn.ne.jp> 2.7.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- added configure option "--disable-bidi"
|
|
|
|
+
|
|
|
|
+* Mon Aug 30 2010 KATO Masashi <mkato@par.odn.ne.jp> 2.5.31-1
|
|
|
|
+- new upstream release
|
|
|
|
+- added BUildRequires libstroke-devel, Requires libstroke
|
|
|
|
+- (for mouse stroke support)
|
|
|
|
+- update Japanese document
|
|
|
|
+- added some wallpapers
|
|
|
|
+
|
|
|
|
+* Wed May 26 2010 KATO Masashi <mkato@par.odn.ne.jp> 2.5.30-1
|
|
|
|
+- new upstream release
|
|
|
|
+
|
|
|
|
+* Wed Apr 2 2010 KATO Masashi <mkato@par.odn.ne.jp> 2.5.29-1
|
|
|
|
+- new upstream release
|
|
|
|
+
|
|
|
|
+* Fri Feb 19 2010 KATO Masashi <mkato@par.odn.ne.jp> 2.5.28-2
|
|
|
|
+- moved desktop-entry to %{_datadir}/xsessions/
|
|
|
|
+
|
|
* Sat Oct 3 2009 KATO Masashi <mkato@par.odn.ne.jp> 2.5.28-1
|
|
* Sat Oct 3 2009 KATO Masashi <mkato@par.odn.ne.jp> 2.5.28-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|