--- fvwm-themes-0.7.0-alt1/fvwm-themes.spec 2004-07-21 11:32:11 +0000 +++ fvwm-themes-0.7.0-alt1.1/fvwm-themes.spec 2005-12-17 14:36:16 +0000 @@ -3,7 +3,7 @@ Name: fvwm-themes Version: 0.7.0 -Release: alt1 +Release: alt1.1 Summary: FVWM Themes, configuration framework for FVWM Summary(ru_RU.UTF-8): Темы для оконного менеджера FVWM @@ -22,8 +22,14 @@ Requires: fvwm-perl >= %{get_version fvw Requires: perl >= 5.004 Requires: m4 -# Automatically added by buildreq on Wed Jul 21 2004 -BuildRequires: XFree86-devel XFree86-utils fvwm-base fvwm-perl menu +# required due to /usr/X11R6 -> /usr relocation +Requires: fvwm-base >= 2.5.14-alt1 +BuildPreReq: fvwm-base >= 2.5.14-alt1 + +BuildPreReq: fvwm-perl + +# Automatically added by buildreq on Sat Dec 17 2005 +BuildRequires: fvwm-base menu xorg-x11-devel xorg-x11-utils %description FVWM Themes is a powerful configuration framework for FVWM, @@ -39,7 +45,7 @@ FVWM Themes является мощны Summary: Extra FVWM Themes Summary(ru_RU.UTF-8): Дополнительные темы для FVWM Group: Graphical desktop/FVWM based -Requires: %name = %version +Requires: %name = %version-%release %description extra FVWM Themes is a powerful configuration framework for FVWM, @@ -64,29 +70,31 @@ perl -pi -e 's,-cronyx-,-\*-,g' locale/r %build ./configure \ - --prefix=%_x11dir \ - --exec-prefix=%_x11dir \ + --prefix=%_prefix \ + --exec-prefix=%_prefix \ + --mandir=%_mandir \ --sysconfdir=%_sysconfdir/X11 make %m_p %install make \ - prefix=$RPM_BUILD_ROOT%{_x11dir} \ + prefix=$RPM_BUILD_ROOT%_prefix \ + mandir=$RPM_BUILD_ROOT%_mandir \ ROOT_PREFIX=$RPM_BUILD_ROOT install %__install -pD -m644 %SOURCE1 $RPM_BUILD_ROOT%_sysconfdir/X11/wmsession.d/10Fvwm-themes find %buildroot -type f -print0 | xargs -r0 %__subst -p s,%buildroot,,g -%__tar xjf %SOURCE2 -C %buildroot%_x11datadir/fvwm/themes -%__mv %buildroot%_x11datadir/fvwm/themes/%name-extra-%version/* %buildroot%_x11datadir/fvwm/themes/ -%__rm -rf %buildroot%_x11datadir/fvwm/themes/%name-extra-%version -find %buildroot%_x11datadir/fvwm/themes -type f -print0 | \ +%__tar xjf %SOURCE2 -C %buildroot%_datadir/fvwm/themes +%__mv %buildroot%_datadir/fvwm/themes/%name-extra-%version/* %buildroot%_datadir/fvwm/themes/ +%__rm -rf %buildroot%_datadir/fvwm/themes/%name-extra-%version +find %buildroot%_datadir/fvwm/themes -type f -print0 | \ xargs -r0 %__subst -p s,-adobe-,-*-,g -find %buildroot%_x11datadir/fvwm/themes -type f -print0 | \ +find %buildroot%_datadir/fvwm/themes -type f -print0 | \ xargs -r0 %__subst -p s,-*-lucida-,-*-serene-,g -find %buildroot%_x11datadir/fvwm/themes -type f -print0 | \ +find %buildroot%_datadir/fvwm/themes -type f -print0 | \ xargs -r0 %__subst -p s,-b\&h-lucida-,-*-serene-,g -find %buildroot%_x11datadir/fvwm/themes -type f -print0 | \ +find %buildroot%_datadir/fvwm/themes -type f -print0 | \ xargs -r0 %__subst -p s,-*-lucidabright-,-*-times-,g -find %buildroot%_x11datadir/fvwm/themes -type f -print0 | \ +find %buildroot%_datadir/fvwm/themes -type f -print0 | \ xargs -r0 %__subst -p s,-*-lucidatypewriter-,-*-serenetypewriter-,g @@ -100,48 +108,52 @@ find %buildroot%_x11datadir/fvwm/themes %clean_wms %files -%_x11bindir/* +%_bindir/* %_sysconfdir/X11/wmsession.d/* %_sysconfdir/menu-methods/* -%_x11mandir/man?/* -%_x11datadir/fvwm/Fvwm* -%_x11datadir/fvwm/themes-rc* -%_x11datadir/fvwm/images/ -%_x11datadir/fvwm/locale/ -%_x11datadir/fvwm/sounds/ -%_x11datadir/fvwm/themes/afterstep/ -%_x11datadir/fvwm/themes/cde/ -%_x11datadir/fvwm/themes/current/ -%_x11datadir/fvwm/themes/default/ -%_x11datadir/fvwm/themes/luthien/ -%_x11datadir/fvwm/themes/migo/ -%_x11datadir/fvwm/themes/multichoice/ -%_x11datadir/fvwm/themes/olicha/ -%_x11datadir/fvwm/themes/redmond98/ -%_x11datadir/fvwm/themes/redmondxp/ +%_mandir/man?/* +%_datadir/fvwm/Fvwm* +%_datadir/fvwm/themes-rc* +%_datadir/fvwm/images/ +%_datadir/fvwm/locale/ +%_datadir/fvwm/sounds/ +%_datadir/fvwm/themes/afterstep/ +%_datadir/fvwm/themes/cde/ +%_datadir/fvwm/themes/current/ +%_datadir/fvwm/themes/default/ +%_datadir/fvwm/themes/luthien/ +%_datadir/fvwm/themes/migo/ +%_datadir/fvwm/themes/multichoice/ +%_datadir/fvwm/themes/olicha/ +%_datadir/fvwm/themes/redmond98/ +%_datadir/fvwm/themes/redmondxp/ %doc AUTHORS NEWS README TODO %doc doc/{FAQ,README.1st,colorsets,creating-themes,fvwm-themes.lsm,menus-extra,functions-appbind-extra} %files extra -%_x11datadir/fvwm/themes/awol/ -%_x11datadir/fvwm/themes/brushedmetal/ -%_x11datadir/fvwm/themes/e17/ -%_x11datadir/fvwm/themes/mech/ -%_x11datadir/fvwm/themes/minimal/ -%_x11datadir/fvwm/themes/osx/ -%_x11datadir/fvwm/themes/qnx/ -%_x11datadir/fvwm/themes/spruce/ -%_x11datadir/fvwm/themes/unsafe/ -%_x11datadir/fvwm/themes/blackbox/ -%_x11datadir/fvwm/themes/celticbow/ -%_x11datadir/fvwm/themes/ice/ -%_x11datadir/fvwm/themes/metal/ -%_x11datadir/fvwm/themes/nanogui/ -%_x11datadir/fvwm/themes/plainbow/ -%_x11datadir/fvwm/themes/sa/ -%_x11datadir/fvwm/themes/underground/ +%_datadir/fvwm/themes/awol/ +%_datadir/fvwm/themes/brushedmetal/ +%_datadir/fvwm/themes/e17/ +%_datadir/fvwm/themes/mech/ +%_datadir/fvwm/themes/minimal/ +%_datadir/fvwm/themes/osx/ +%_datadir/fvwm/themes/qnx/ +%_datadir/fvwm/themes/spruce/ +%_datadir/fvwm/themes/unsafe/ +%_datadir/fvwm/themes/blackbox/ +%_datadir/fvwm/themes/celticbow/ +%_datadir/fvwm/themes/ice/ +%_datadir/fvwm/themes/metal/ +%_datadir/fvwm/themes/nanogui/ +%_datadir/fvwm/themes/plainbow/ +%_datadir/fvwm/themes/sa/ +%_datadir/fvwm/themes/underground/ %changelog +* Sat Dec 17 2005 Sergey Vlasov 0.7.0-alt1.1 +- Moved all files from /usr/X11R6 to /usr for fvwm-2.5.14-alt1. +- Updated BuildRequires. + * Wed Jul 21 2004 Eugene Vlasov 0.7.0-alt1 - New version - Added WM session entry --- fvwm-themes-0.7.0-alt1/fvwm-themes.wmsession 2004-07-20 16:33:33 +0000 +++ fvwm-themes-0.7.0-alt1.1/fvwm-themes.wmsession 2005-12-17 14:12:21 +0000 @@ -1,6 +1,6 @@ NAME=FVWM-Themes ICON=/usr/share/icons/Fvwm.xpm -EXEC=/usr/X11R6/bin/fvwm-themes-start +EXEC=/usr/bin/fvwm-themes-start DESC=FVWM Themes, configuration framework for FVWM SCRIPT: -exec /usr/X11R6/bin/fvwm-themes-start +exec /usr/bin/fvwm-themes-start End of diff