From 8afa1c1057de1c12ecdd1103ddde6837b10d20865e7218d7ec603f07902477a3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 1 Mar 2007 21:19:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=6 --- fvwm-2.5.21-sv_SE.patch | 11 +++++++++++ fvwm2.changes | 7 +++++++ fvwm2.spec | 15 ++++++++++----- 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 fvwm-2.5.21-sv_SE.patch diff --git a/fvwm-2.5.21-sv_SE.patch b/fvwm-2.5.21-sv_SE.patch new file mode 100644 index 0000000..afd179d --- /dev/null +++ b/fvwm-2.5.21-sv_SE.patch @@ -0,0 +1,11 @@ +--- configure.ac ++++ configure.ac +@@ -923,7 +923,7 @@ + AC_SUBST(FVWM_PERLLIB) + + # ******* gettext +-ALL_LINGUAS="ar de fr sv_SE zh_CN" ++ALL_LINGUAS="ar de fr sv zh_CN" + FVWM_DOMAIN="fvwm" + FVWMTASKBAR_DOMAIN="FvwmTaskBar" + FVWMSCRIPT_DOMAIN="FvwmScript" diff --git a/fvwm2.changes b/fvwm2.changes index 717a1a2..f96c708 100644 --- a/fvwm2.changes +++ b/fvwm2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 28 14:58:04 CET 2007 - lmichnovic@suse.cz + +- renamed sv_SE to sv, (sv_SE.patch) [#248751] +- removed xorg-x11 from Requires and Buildrequires since + /usr/share/xsessions is part of filesystem [#229172] + ------------------------------------------------------------------- Tue Feb 13 17:58:44 CET 2007 - lmichnovic@suse.cz diff --git a/fvwm2.spec b/fvwm2.spec index 493b8a1..172d57c 100644 --- a/fvwm2.spec +++ b/fvwm2.spec @@ -11,14 +11,14 @@ # norootforbuild Name: fvwm2 -BuildRequires: freetype2-devel fribidi-devel gcc-c++ gtk-devel gtkdoc imlib-config imlib-devel libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files xorg-x11 +BuildRequires: freetype2-devel fribidi-devel gcc-c++ gtk-devel gtkdoc imlib-config imlib-devel libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files License: BSD License and BSD-like Group: System/GUI/Other Provides: fvwmicns windowmanager xpmroot Obsoletes: fvwm xpmroot Autoreqprov: on Version: 2.5.21 -Release: 2 +Release: 4 Summary: Improved Version of FVWM Window Manager URL: http://www.fvwm.org Source0: fvwm-2.5.21.tar.bz2 @@ -28,10 +28,11 @@ Source4: system.fvwm2rc Source5: _system.fvwm2rc Source6: openSuSE.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: xdg-menu, desktop-data, mktemp, xli, xorg-x11 +Requires: xdg-menu, desktop-data, mktemp, xli Patch0: fvwm-configure.patch Patch1: fvwm-%{version}-gcc-warnings.patch Patch2: fvwm-%{version}-ia64.patch +Patch3: fvwm-%{version}-sv_SE.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -66,6 +67,8 @@ Authors: %patch0 %patch1 %patch2 +%patch3 +find . -name *sv_SE* |xargs rename sv_SE sv mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 cp %{S:6} icons @@ -142,8 +145,6 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils/quantize_pixmaps %dir %{_xorg7prefix}/lib/X11/fvwm2 %{_xorg7prefix}/share/fvwm -%dir %{_xorg7prefix}/share/locale/sv_SE -%dir %{_xorg7prefix}/share/locale/sv_SE/LC_MESSAGES %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2 %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps %dir %{_prefix}/%{_xorg7libshare}/X11/fvwm2/utils @@ -161,6 +162,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 28 2007 - lmichnovic@suse.cz +- renamed sv_SE to sv, (sv_SE.patch) [#248751] +- removed xorg-x11 from Requires and Buildrequires since + /usr/share/xsessions is part of filesystem [#229172] * Tue Feb 13 2007 - lmichnovic@suse.cz - adjusted fvwm2rc file, thanks to Thomas Adam [#242015] * Tue Feb 13 2007 - lmichnovic@suse.cz