Hello community, here is the log from the commit of package WindowMaker for openSUSE:Factory checked in at 2012-02-20 16:19:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/WindowMaker (Old) and /work/SRC/openSUSE:Factory/.WindowMaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "WindowMaker", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/WindowMaker/WindowMaker.changes 2011-11-16 17:23:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.WindowMaker.new/WindowMaker.changes 2012-02-20 16:19:41.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Feb 17 23:01:00 UTC 2012 - [email protected] + +- update to 0.95.2 + * no up-to-date ChangeLog available + see http://repo.or.cz/w/wmaker-crm.git/shortlog +- rebase patches + * config, menu +- remove obsolete patches +- rpmlintrc + * add macro-in-comment + * remove suse-filelist-forbidden +- add missing libjpeg-devel + +------------------------------------------------------------------- Old: ---- Window-Maker-5a2507602c48.tar.bz2 WindowMaker-0.92.0-printf.diff WindowMaker-MAX_WORKSPACENAME_WIDTH.patch WindowMaker-asm.patch WindowMaker-composite.patch WindowMaker-config.dif WindowMaker-crash.patch WindowMaker-de_translation.patch WindowMaker-dir-specification.patch WindowMaker-event.patch WindowMaker-fonts.patch WindowMaker-nb-locale.patch WindowMaker-null.patch WindowMaker-png_check_sig.patch WindowMaker-warnings.patch WindowMaker-wmspec.c-findBestIcon.patch wm-linking.patch New: ---- WindowMaker-0.95.2.tar.bz2 WindowMaker-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ WindowMaker.spec ++++++ --- /var/tmp/diff_new_pack.fmOifq/_old 2012-02-20 16:19:42.000000000 +0100 +++ /var/tmp/diff_new_pack.fmOifq/_new 2012-02-20 16:19:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package WindowMaker # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,104 +18,111 @@ Name: WindowMaker -BuildRequires: fontconfig-devel freetype2-devel gcc-c++ giflib-devel -BuildRequires: libpng-devel libtiff-devel libtool update-desktop-files xorg-x11-devel +Summary: A Colorful and Flexible Window Manager License: GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain Group: System/GUI/Other -Url: http://www.windowmaker.info/ -Obsoletes: wmaker -Provides: wmaker windowmanager -Requires: xdg-menu -Summary: A Colorful and Flexible Window Manager -Version: 0.92.0 -Release: 219 -Source: Window-Maker-5a2507602c48.tar.bz2 -Source1: WindowMaker-extra-0.1.tar.bz2 +Version: 0.95.2 +Release: 0 +Url: http://windowmaker.org/ +Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2 +Source1: %{name}-extra-0.1.tar.bz2 Source2: SuSE-theme.tar.bz2 Source4: README.SuSE -Source5: %name.desktop +Source5: %{name}.desktop Source6: windowmaker -Source7: WindowMaker-rpmlintrc -Patch1: WindowMaker-config.dif -Patch2: WindowMaker-menu.patch -Patch22: WindowMaker-warnings.patch -Patch24: WindowMaker-nb-locale.patch -Patch26: WindowMaker-null.patch -Patch27: WindowMaker-de_translation.patch -Patch29: WindowMaker-asm.patch -Patch31: WindowMaker-MAX_WORKSPACENAME_WIDTH.patch -Patch32: WindowMaker-0.92.0-printf.diff -Patch34: WindowMaker-crash.patch -Patch35: WindowMaker-fonts.patch -Patch37: WindowMaker-event.patch -Patch38: WindowMaker-wmspec.c-findBestIcon.patch -Patch39: WindowMaker-dir-specification.patch -Patch40: WindowMaker-composite.patch -Patch41: WindowMaker-png_check_sig.patch -Patch42: wm-linking.patch - +Source7: %{name}-rpmlintrc +Patch1: %{name}-config.patch +Patch2: %{name}-menu.patch +# BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel +BuildRequires: gcc-c++ +BuildRequires: giflib-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libtool +%if 0%{?suse_version} > 1210 +BuildRequires: libXft-devel +%endif +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +Provides: wmaker +Provides: windowmanager +Requires: xdg-menu + +%description +Window Maker is an X11 window manager originally designed to provide +integration support for the GNUstep Desktop Environment. In every way +possible, it reproduces the elegant look and feel of the NEXTSTEP user +interface. It is fast, feature rich, easy to configure, and easy to +use. It is also free software, with contributions being made by +programmers from around the world. + +Window Maker has a stable user interface since many years and comes +with a powerful GUI configuration editor called WPrefs, which removes +the need to edit text-based config files by hand. It supports running +dockapps which make everyday tasks such as monitoring system +performance and battery usage, mounting devices or connecting to the +internet very easy. Please see the features section for more specifics +on what Window Maker can do, and how it compares with other popular +window managers. %package devel +Summary: Development files for WindowMaker License: GPL-2.0+ -Requires: %{name} = %{version} libtiff-devel libjpeg-devel xorg-x11-devel libpng-devel zlib-devel giflib-devel -Summary: Includes and static libraries for Window Maker Group: Development/Libraries/X11 - -%description -Window Maker is a colorful and flexible window manager and -the designated successor of AfterStep. For more details, check -http://www.windowmaker.org. +Requires: %{name} = %{version} +Requires: giflib-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libtiff-devel +Requires: xorg-x11-devel +Requires: zlib-devel %description devel -Includes and static libraries for Window Maker +This package contains the header files and libraries necessary for +developing applications which use WindowMaker. %prep -%setup -q -n Window-Maker-5a2507602c48 -a 1 -mkdir menu.orig -cp WindowMaker/{menu.*,plmenu.*} menu.orig +%setup -q -n %{name}-%{version} -a 1 +mkdir menu_orig +cp %{name}/{menu.*,plmenu.*} menu_orig %patch1 %patch2 -%patch22 -%patch24 -%patch26 -p1 -%patch27 -#patch29 -%patch31 -%patch32 -%patch34 -%patch35 -%patch37 -%patch38 -%patch39 -%patch40 -%patch41 -%patch42 cp %{S:4} . cp %{S:6} . +%if 0%{?suse_version} < 1140 rename no nb po/no.* -(cd WindowMaker; rm -f *.orig; ./mkMakefile ) +%endif +(cd %{name}; rm -f *.orig; ./mkMakefile ) # --------------------------------------------------------------------------- %build -autoreconf --force --install -export LINGUAS="be bg ca cs da de el es et fi fr gl hr hu it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW" +#autoreconf --force --install +%if 0%{?suse_version} >= 1140 +export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" +%else +export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW" +%endif export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)" -%configure --disable-static --with-pic\ +%configure \ + --disable-static \ + --with-pic\ --sysconfdir=/etc/X11 \ - --enable-sound \ - --enable-gnome \ - --enable-kde \ --enable-xinerama \ --with-nlsdir=/usr/share/locale \ - --with-pixmapdir=/usr/share/WindowMaker/Pixmaps \ + --with-pixmapdir=/usr/share/%{name}/Pixmaps \ --with-gnustepdir=/usr/lib/GNUstep -(cd WindowMaker/Defaults; make clean; make %{?_smp_mflags}) +(cd %{name}/Defaults; make clean; make %{?_smp_mflags}) make %{?_smp_mflags} -(cd WindowMaker-extra-0.1 -%configure --disable-static --with-pic\ - --with-pixmapdir=/usr/share/WindowMaker/Pixmaps +(cd %{name}-extra-0.1 +%configure \ + --disable-static \ + --with-pic\ + --with-pixmapdir=/usr/share/%{name}/Pixmaps make %{?_smp_mflags} ) @@ -125,23 +132,24 @@ make DESTDIR=$RPM_BUILD_ROOT install install -m 755 dockit $RPM_BUILD_ROOT/usr/bin/dockit install -m 755 windowmaker $RPM_BUILD_ROOT/usr/bin/windowmaker -cd WindowMaker-extra-0.1 +cd %{name}-extra-0.1 make DESTDIR=$RPM_BUILD_ROOT install -tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes/ -find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type f -exec chmod 644 {} \; -find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type d -exec chmod 755 {} \; +tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%{name}/Themes/ +find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type f -exec chmod 644 {} \; +find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type d -exec chmod 755 {} \; #---------------------------------------------------------------------- # not packaged -rm -f $RPM_BUILD_ROOT/%{_mandir}/sk/man1/* +rm -f $RPM_BUILD_ROOT/%{_mandir}/{cs,ru,sk}/man1/* rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la # install kdm/gdm entry install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ install -m 0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/xsessions/ -%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%name.desktop +%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%{name}.desktop cd .. %find_lang %{name} %find_lang WINGs %{name}.lang %find_lang WPrefs %{name}.lang +%find_lang wmgenmenu %{name}.lang %post -p /sbin/ldconfig @@ -149,25 +157,25 @@ %files -f %{name}.lang %defattr(-,root,root) -%dir /etc/X11/WindowMaker -%config /etc/X11/WindowMaker/* +%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N +%doc NEWS README* TODO +%doc menu_orig +%dir /etc/X11/%{name} +%config /etc/X11/%{name}/* /usr/lib/GNUstep /usr/bin/* %{_libdir}/*.so.* %{_mandir}/man1/* /usr/share/WINGs -/usr/share/WindowMaker +/usr/share/%{name} /usr/share/xsessions/* -%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N -%doc MIRRORS NEWS README TODO README.SuSE -%doc menu.orig -#/usr/X11R6/share/WindowMaker +#/usr/X11R6/share/%{name} #/usr/X11R6/GNUstep %files devel %defattr(-,root,root) -%{_libdir}/pkgconfig/*.pc %{_includedir}/* +%{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %changelog ++++++ WindowMaker-config.dif -> WindowMaker-config.patch ++++++ --- /work/SRC/openSUSE:Factory/WindowMaker/WindowMaker-config.dif 2011-09-23 01:51:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.WindowMaker.new/WindowMaker-config.patch 2012-02-20 16:19:40.000000000 +0100 @@ -1,4 +1,6 @@ ---- WindowMaker/Defaults/WindowMaker.in +Index: WindowMaker/Defaults/WindowMaker.in +=================================================================== +--- WindowMaker/Defaults/WindowMaker.in.orig +++ WindowMaker/Defaults/WindowMaker.in @@ -1,5 +1,6 @@ { @@ -34,7 +36,9 @@ MouseMiddleButtonAction = OpenWindowListMenu; MouseRightButtonAction = OpenApplicationsMenu; MouseWheelAction = None; ---- dockit +Index: dockit +=================================================================== +--- /dev/null +++ dockit @@ -0,0 +1,247 @@ +#!/bin/sh @@ -284,35 +288,36 @@ + close $m1 +} + ---- util/wmaker.inst.in +Index: util/wmaker.inst.in +=================================================================== +--- util/wmaker.inst.in.orig +++ util/wmaker.inst.in -@@ -312,42 +312,43 @@ +@@ -281,41 +281,41 @@ fi } wmaker_found=0 -for xinit in .xinitrc .Xclients .xsession; do - test ! -f "$HOME/$xinit" && continue -- res="`grep wmaker $HOME/$xinit`" +- res="$(grep wmaker "$HOME/$xinit")" - if test "x$res" != x; then - wmaker_found=1 - break - fi -done --if test $wmaker_found = 1; then +-if test "$wmaker_found" = 1; then - echo "Found Window Maker to already be your default window manager." - show_end_message - exit 0 -fi +#for xinit in .xinitrc .Xclients .xsession; do +# test ! -f "$HOME/$xinit" && continue -+# res="`grep wmaker $HOME/$xinit`" ++# res="$(grep wmaker "$HOME/$xinit")" +# if test "x$res" != x; then +# wmaker_found=1 +# break +# fi +#done -+ -+#if test $wmaker_found = 1; then ++#if test "$wmaker_found" = 1; then +# echo "Found Window Maker to already be your default window manager." +# show_end_message +# exit 0 @@ -335,8 +340,8 @@ - file=.xinitrc -fi - --if [ -f $USERDIR/$file ]; then -- mv $USERDIR/$file $USERDIR/$file.old.$DATE +-if [ -f "$USERDIR/$file" ]; then +- mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" -fi +#echo +#echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that" @@ -352,12 +357,11 @@ +# file=.xinitrc +#fi + -+#if [ -f $USERDIR/$file ]; then -+# mv $USERDIR/$file $USERDIR/$file.old.$DATE ++#if [ -f "$USERDIR/$file" ]; then ++# mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" +#fi --make_script $USERDIR/$file -+# make_script $USERDIR/$file +-make_script "$USERDIR/$file" ++#make_script "$USERDIR/$file" show_end_message - ++++++ WindowMaker-menu.patch ++++++ ++++ 1389 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/WindowMaker/WindowMaker-menu.patch ++++ and /work/SRC/openSUSE:Factory/.WindowMaker.new/WindowMaker-menu.patch ++++++ WindowMaker-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.fmOifq/_old 2012-02-20 16:19:42.000000000 +0100 +++ /var/tmp/diff_new_pack.fmOifq/_new 2012-02-20 16:19:43.000000000 +0100 @@ -1,2 +1 @@ -# no left over, but the original menu -addFilter("E: suse-filelist-forbidden.*/usr/share/doc/packages/WindowMaker/menu.orig") +addFilter("macro-in-comment") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
