rpm/WindowMaker
SHA256
1
0
Fork 0
forked from pool/WindowMaker
Code Pull Requests Activity

Accepting request 484223 from X11:windowmanagers

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/484223
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=42
This commit is contained in:
Yuchen Lin 2017-04-12 15:34:20 +00:00 committed by Git OBS Bridge
commit 98b5a954b1
9 changed files with 790 additions and 1025 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
README.SuSE → README.SUSE
View File

3
WindowMaker-0.95.7.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
size 3238325

3
WindowMaker-0.95.8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
size 3253515

4
WindowMaker-config.patch
View File

@ -9,7 +9,7 @@ Index: WindowMaker/Defaults/WindowMaker.in
PopupSwitchMenu = NO;
MenuStyle = normal;
DisableMiniwindows = NO;
@@ -33,7 +34,7 @@
@@ -34,7 +35,7 @@
IconSize = 64;
FocusMode = manual;
DisableWSMouseActions = NO;
@ -274,7 +274,7 @@ Index: util/wmaker.inst.in
===================================================================
--- util/wmaker.inst.in.orig
+++ util/wmaker.inst.in
@@ -276,41 +276,41 @@ echo " $GSDIR/Library/WindowMaker/$in
@@ -280,41 +280,41 @@ echo " $GSDIR/Library/WindowMaker/$in
}
wmaker_found=0

748
WindowMaker-menu.patch
View File

File diff suppressed because it is too large Load Diff

22
WindowMaker.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Mar 14 22:02:11 UTC 2017 - chris@computersalat.de
- Update to 0.95.8
* for changes and news see
http://repo.or.cz/wmaker-crm.git/blob/HEAD:/NEWS
http://repo.or.cz/wmaker-crm.git/blob/HEAD:/ChangeLog
- rework/rebase patches
* WindowMaker-menu.patch
* wm-giflib.patch
- some spec cleanup
* rename README.SuSE -> README.SUSE
-------------------------------------------------------------------
Sat Jun 25 18:13:37 UTC 2016 - chris@computersalat.de
- rebase patches (p0)
* WindowMaker-config.patch
* WindowMaker-menu.patch
* fix_wmgenmenu_paths.patch
* wm-giflib.patch
-------------------------------------------------------------------
Tue Mar 22 13:03:08 UTC 2016 - kmroz@suse.com

23
WindowMaker.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package WindowMaker
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@ Name: WindowMaker
Summary: A Colorful and Flexible Window Manager
License: GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain
Group: System/GUI/Other
Version: 0.95.7
Version: 0.95.8
Release: 0
# 81eefca4ef70414d73048300058e5007f402dd7f
# f846b7cdd39749b5291d4559185a229b752b4fed
@ -29,7 +29,7 @@ Url: http://windowmaker.org/
Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
Source1: %{name}-extra-0.1.tar.bz2
Source2: theme.tar.bz2
Source4: README.SuSE
Source4: README.SUSE
Source5: %{name}.desktop
Source6: windowmaker
Source7: %{name}-rpmlintrc
@ -39,6 +39,7 @@ Patch3: fix_wmgenmenu_paths.patch
#
Patch101: wm-giflib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
@ -96,25 +97,19 @@ developing applications which use WindowMaker.
mkdir menu_orig
cp %{name}/{menu.*,plmenu.*} menu_orig
%patch1
%patch2 -p1
%patch3 -p1
%patch101 -p1
%patch2
%patch3
%patch101
cp %{S:4} .
cp %{S:6} .
%if 0%{?suse_version} < 1140
rename no nb po/no.*
%endif
(cd %{name}; rm -f *.orig; ./mkMakefile )
# ---------------------------------------------------------------------------
%build
./autogen.sh
#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 \
--prefix=/usr \
@ -127,7 +122,6 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
--with-pixmapdir=/usr/share/%{name}/Pixmaps \
--with-gnustepdir=/usr/lib/GNUstep
(cd %{name}/Defaults; make clean; make %{?_smp_mflags})
make %{?_smp_mflags}
(cd %{name}-extra-0.1
%configure \
@ -167,6 +161,9 @@ cd ..
%find_lang WPrefs %{name}.lang
%find_lang wmgenmenu %{name}.lang
# rpmlint
%fdupes -s $RPM_BUILD_ROOT/usr/share/
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

10
fix_wmgenmenu_paths.patch
View File

@ -12,10 +12,10 @@ Fix this by writing strings composed with PKGDATADIR.
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
---
Index: WindowMaker-0.95.6/util/wmgenmenu.c
Index: util/wmgenmenu.c
===================================================================
--- WindowMaker-0.95.6.orig/util/wmgenmenu.c
+++ WindowMaker-0.95.6/util/wmgenmenu.c
--- util/wmgenmenu.c.orig
+++ util/wmgenmenu.c
@@ -41,12 +41,13 @@ int main(int argc, char *argv[])
{
char *t;
@ -31,7 +31,7 @@ Index: WindowMaker-0.95.6/util/wmgenmenu.c
struct option longopts[] = {
{ "version", no_argument, NULL, 'v' },
@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
@@ -245,7 +246,7 @@ int main(int argc, char *argv[])
L3Menu = WMCreatePLArray(
WMCreatePLString(_("Images")),
WMCreatePLString("OPEN_MENU"),
@ -40,7 +40,7 @@ Index: WindowMaker-0.95.6/util/wmgenmenu.c
NULL
);
WMAddToPLArray(L2Menu, L3Menu);
@@ -333,7 +334,7 @@ int main(int argc, char *argv[])
@@ -334,7 +335,7 @@ int main(int argc, char *argv[])
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Configure Window Maker")),
WMCreatePLString("EXEC"),

1002
wm-giflib.patch
View File

File diff suppressed because it is too large Load Diff