[WindowMaker] 0.95.0-0.2.crm.a9e136ec41118f8842f7aa1457b2db83dbde6b7f fix requires
Andreas Bierfert
awjb at fedoraproject.org
Sat Dec 17 16:59:48 UTC 2011
commit 94e4725610e40f461c78b3a0833fd8da3d2db182
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Sat Dec 17 17:59:38 2011 +0100
0.95.0-0.2.crm.a9e136ec41118f8842f7aa1457b2db83dbde6b7f
fix requires
.gitignore | 1 +
WindowMaker-0.80.2-cvs-alt-textfield.patch | 28 -
WindowMaker-0.91.0-alt-adialog.patch | 520 -
WindowMaker-0.91.0-alt-clipnotext.patch | 37 -
WindowMaker-0.91.0-alt-dockhotkeys.patch | 446 -
WindowMaker-0.91.0-alt-focus.patch | 12 -
WindowMaker-0.91.0-alt-menutrans.patch | 167 -
WindowMaker-0.91.0-alt-mmx.patch | 19 -
WindowMaker-0.91.0-alt-restartscrpt.patch | 10 -
WindowMaker-0.91.0-alt-session.patch | 12 -
WindowMaker-0.91.0-alt-sowings.patch | 276 -
WindowMaker-0.91.0-alt-titlebar.patch | 186 -
WindowMaker-0.91.0-alt-vlaad-newbuttons.patch | 1070 -
WindowMaker-0.91.0-alt-vlaad-trance.patch | 321 -
WindowMaker-0.91.0-hmepas-minimizeall.patch | 115 -
WindowMaker-0.91.0-hmepas-swmenu_rclick.patch | 116 -
WindowMaker-0.91.0-peter-appicon-bouncer2.patch | 229 -
WindowMaker-0.91.0-peter-mouse-placement.patch | 200 -
WindowMaker-0.91.0-peter-newappicon.patch | 193 -
WindowMaker-0.91.0-sga-moving-add.patch | 278 -
WindowMaker-0.91.0-sga-swpanel-customization.patch | 77 -
WindowMaker-0.91.0-wmcontrib-singleclick.patch | 168 -
WindowMaker-0.92.0-alt-newpo.patch | 24 -
WindowMaker-0.92.0-cvs20060123.patch |26385 --------------------
WindowMaker-README.newbuttons | 34 -
WindowMaker-application.desktop | 6 +
WindowMaker-dso.patch | 11 -
WindowMaker-gcc41.patch | 37 -
WindowMaker-newbuttons.nextstyle.tiff | Bin 4004 -> 0 bytes
WindowMaker-newbuttons.nextstyle.xpm | 120 -
WindowMaker-newbuttons.oldstyle.tiff | Bin 4004 -> 0 bytes
WindowMaker-wakeup-delayedAction.patch | 13 -
WindowMaker-wakeup-dnotify.patch | 153 -
WindowMaker-wakeup-timer.patch | 46 -
WindowMaker-xsession.desktop | 5 +
WindowMaker.desktop | 9 -
WindowMaker.spec | 260 +-
sources | 3 +-
38 files changed, 106 insertions(+), 31481 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7ac759..5c178ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
WindowMaker-0.92.0.tar.bz2
WindowMaker-extra-0.1.tar.gz
+/wmaker-crm-a9e136ec41118f8842f7aa1457b2db83dbde6b7f.tar.gz
diff --git a/WindowMaker-application.desktop b/WindowMaker-application.desktop
new file mode 100644
index 0000000..f4c4e1e
--- /dev/null
+++ b/WindowMaker-application.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=WindowMaker
+Comment=A fast, feature rich Window Manager
+Exec=wmaker
+Type=Application
+NoDisplay=true
diff --git a/WindowMaker-xsession.desktop b/WindowMaker-xsession.desktop
new file mode 100644
index 0000000..de85f29
--- /dev/null
+++ b/WindowMaker-xsession.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=WindowMaker
+Comment=A fast, feature rich Window Manager
+Exec=wmaker
+Type=Application
diff --git a/WindowMaker.spec b/WindowMaker.spec
index f09145a..1846449 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,62 +1,22 @@
-Summary: A fast, feature rich Window Manager
-Name: WindowMaker
-Version: 0.92.0
-Release: 23%{?dist}
-
-License: GPLv2+
-Group: User Interface/Desktops
-URL: http://www.windowmaker.info/
-Source0: ftp://windowmaker.info/pub/source/release/WindowMaker-0.92.0.tar.bz2
-Source2: WindowMaker.desktop
-Source3: WindowMaker-uk.po
-Source4: WPrefs-uk.po
-Source5: WindowMaker-README.newbuttons
-Source6: WindowMaker-newbuttons.nextstyle.tiff
-Source7: WindowMaker-newbuttons.nextstyle.xpm
-Source8: WindowMaker-newbuttons.oldstyle.tiff
-
-Source10: ftp://windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
-
-# cvs snapshot
-Patch0: WindowMaker-0.92.0-cvs20060123.patch
-Patch1: WindowMaker-gcc41.patch
-Patch2: WindowMaker-dso.patch
-#patches from altlinux
-Patch101: WindowMaker-0.91.0-alt-sowings.patch
-Patch102: WindowMaker-0.91.0-alt-session.patch
-Patch103: WindowMaker-0.91.0-alt-restartscrpt.patch
-Patch104: WindowMaker-0.91.0-alt-menutrans.patch
-Patch105: WindowMaker-0.91.0-alt-titlebar.patch
-Patch106: WindowMaker-0.91.0-alt-clipnotext.patch
-Patch107: WindowMaker-0.91.0-alt-mmx.patch
-Patch108: WindowMaker-0.80.2-cvs-alt-textfield.patch
-Patch109: WindowMaker-0.91.0-alt-focus.patch
-
-#add new features as well (sound good)
-Patch200: WindowMaker-0.91.0-wmcontrib-singleclick.patch
-Patch201: WindowMaker-0.91.0-alt-dockhotkeys.patch
-Patch202: WindowMaker-0.91.0-alt-vlaad-trance.patch
-Patch203: WindowMaker-0.91.0-alt-vlaad-newbuttons.patch
-Patch204: WindowMaker-0.91.0-alt-adialog.patch
-Patch205: WindowMaker-0.91.0-hmepas-minimizeall.patch
-Patch206: WindowMaker-0.91.0-hmepas-swmenu_rclick.patch
-Patch207: WindowMaker-0.91.0-sga-moving-add.patch
-Patch208: WindowMaker-0.91.0-peter-newappicon.patch
-Patch209: WindowMaker-0.91.0-peter-mouse-placement.patch
-# actually a fixed version that does respect animations of settings
-# for the bounce animation. Fixes #185579.
-Patch210: WindowMaker-0.91.0-peter-appicon-bouncer2.patch
-Patch211: WindowMaker-0.91.0-sga-swpanel-customization.patch
-Patch212: WindowMaker-0.92.0-alt-newpo.patch
-
-# wakeup enhancements to save power (#267041)
-Patch301: WindowMaker-wakeup-dnotify.patch
-Patch302: WindowMaker-wakeup-delayedAction.patch
-Patch303: WindowMaker-wakeup-timer.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: libpng-devel libjpeg-devel libungif-devel
-BuildRequires: libtiff-devel zlib-devel gettext-devel
+%global githash a9e136ec41118f8842f7aa1457b2db83dbde6b7f
+
+Summary: A fast, feature rich Window Manager
+Name: WindowMaker
+Version: 0.95.0
+Release: 0.2.crm.%{githash}%{?dist}
+
+License: GPLv2+
+Group: User Interface/Desktops
+URL: http://www.windowmaker.org
+Source0: http://repo.or.cz/w/wmaker-crm.git/snapshot/wmaker-crm-%{githash}.tar.gz
+Source1: WindowMaker-xsession.desktop
+Source2: WindowMaker-application.desktop
+
+Source3: WindowMaker-uk.po
+Source4: WPrefs-uk.po
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+# X BR
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
@@ -66,18 +26,25 @@ BuildRequires: libXinerama-devel
BuildRequires: libXpm-devel
BuildRequires: libXrender-devel
BuildRequires: xorg-x11-proto-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXrandr-devel
+# graphic BR
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libungif-devel
+BuildRequires: libtiff-devel
+
+# other
+BuildRequires: zlib-devel
+BuildRequires: gettext-devel
BuildRequires: fontconfig-devel
-BuildRequires: automake14 libtool
+BuildRequires: automake autoconf libtool
-Requires: WINGs-libs = %{version}-%{release}
+# replace old window maker devel package
+Obsoletes: WindowMaker-devel <= 0.92.0
+Provides: WindowMaker-devel = %{version}-%{release}
-%package devel
-Summary: Development files needed for WindowMaker
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: WINGs-devel = %{version}-%{release}
-Requires: libX11-devel
-Requires: pkgconfig
+Requires: WINGs-libs = %{version}-%{release}
%description
Window Maker is an X11 window manager designed to give additional
@@ -87,15 +54,9 @@ GUI. It is fast, feature rich, easy to configure, and easy to use. In
addition, Window Maker works with GNOME and KDE, making it one of the
most useful and universal window managers available.
-%description devel
-Window Maker is an X11 window manager designed to give additional
-integration support to the GNUstep Desktop Environment. In every way
-possible, it reproduces the elegant look and feel of the NeXTSTEP[tm]
-GUI. This package contains development files for WindowMaker libraries.
-
%package -n WINGs-libs
-Summary: Widgets and image libraries needed for WindowMaker
-Group: System Environment/Libraries
+Summary: Widgets and image libraries needed for WindowMaker
+Group: System Environment/Libraries
%description -n WINGs-libs
Widgets and image libraries needed for WindowMaker.
@@ -103,63 +64,32 @@ Widgets and image libraries needed for WindowMaker.
%package -n WINGs-devel
Summary: Development files for the WINGs library
Group: System Environment/Libraries
-Requires: libX11-devel
-Requires: xorg-x11-proto-devel
-Requires: libXinerama-devel
-Requires: libXext-devel
-Requires: libtiff-devel
-Requires: zlib-devel
-Requires: libXpm-devel
-Requires: libjpeg-devel
-Requires: libpng-devel
-Requires: libungif-devel
-Requires: libXft-devel
-Requires: fontconfig-devel
+Requires: WINGs-libs = %{version}-%{release}
+Requires: libX11-devel
+Requires: xorg-x11-proto-devel
+Requires: libXinerama-devel
+Requires: libXrandr-devel
+Requires: libXext-devel
+Requires: libtiff-devel
+Requires: zlib-devel
+Requires: libXpm-devel
+Requires: libjpeg-devel
+Requires: libpng-devel
+Requires: libungif-devel
+Requires: libXft-devel
+Requires: fontconfig-devel
%description -n WINGs-devel
Development files for the WINGs library.
%prep
-%setup -q -a10
-
-%patch0 -p1
-%patch1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch204 -p1
-%patch205 -p1
-%patch206 -p1
-%patch207 -p1
-%patch208 -p1
-%patch209 -p1
-%patch210 -p1
-%patch211 -p1
-%patch212 -p1 -b .vns
-%patch301 -p1
-%patch302 -p1
-%patch303 -p1
-
-%patch2 -p1 -b .dso
+%setup -q -n wmaker-crm
+# add uk translation
cp %{SOURCE3} po/uk.po
cp %{SOURCE4} WPrefs.app/po/uk.po
-cp %{SOURCE5} README.newbuttons
-
-cp %{SOURCE6} WPrefs.app/tiff/nextstyle.tiff
-cp %{SOURCE7} WPrefs.app/xpm/nextstyle.xpm
-cp %{SOURCE8} WPrefs.app/tiff/oldstyle.tiff
+# cleanup menu entries
for i in WindowMaker/*menu* ; do
echo $i
sed -i.old -e 's:/usr/local/:%{_prefix}/:g' \
@@ -167,48 +97,40 @@ sed -i.old -e 's:/usr/local/:%{_prefix}/:g' \
-e 's:GNUstep/Applications/WPrefs.app:bin:g' $i
done
-autoreconf -sif
+./autogen.sh
%build
-# enable new features
-CFLAGS="$RPM_OPT_FLAGS -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP"
-LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')`
+CFLAGS="$RPM_OPT_FLAGS -DNEWAPPICON"
+LINGUAS=`(cd po ; echo *.po | sed 's/.po//g')`
NLSDIR="%{_datadir}/locale"
+
export CFLAGS LINGUAS NLSDIR
-%configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \
---enable-fast-install --enable-modelock --x-includes=%{_includedir} \
---x-libraries=%{_libdir} --disable-mmx --disable-static --enable-shared
-#smp_mflags are broken atm
-make #%{?_smp_mflags}
-# do extras stuff
-cd WindowMaker-extra-0.1
-%configure --x-libraries=%{_libdir} --x-includes=%{_includedir}
-cd ..
+%configure \
+ --disable-static \
+ --enable-modelock \
+ --enable-xrandr \
+ --enable-xinerama \
+ --enable-usermenu \
+ --x-includes=%{_includedir} \
+ --x-libraries=%{_libdir}
+
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT NLSDIR=%{_datadir}/locale install
-%find_lang '\(WPrefs\|%{name}\|WINGs\)'
+%find_lang '\(WPrefs\|WindowMaker\|WINGs\|wmgenmenu\)'
-install -D -m0644 -p %{SOURCE2} \
+install -D -m0644 -p %{SOURCE1} \
%{buildroot}%{_datadir}/xsessions/WindowMaker.desktop
+install -D -m0644 -p %{SOURCE2} \
+%{buildroot}%{_datadir}/applications/WindowMaker.desktop
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-chmod 755 %{buildroot}%{_datadir}/%{name}/{autostart.sh,exitscript.sh}
-
-# now install extras stuff
-make -C WindowMaker-extra-0.1 install DESTDIR=$RPM_BUILD_ROOT
-
-# clean up wmlib.pc
-sed -i -e 's:-lWUtil::' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/wmlib.pc
-
-#multilib fun
-sed -i -e 's:^WLFLAGS[\w="].*::' \
- $RPM_BUILD_ROOT%{_bindir}/get-{wutil,wings,wraster}-flags
-touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/get-{wutil,wings,wraster}-flags
+chmod 755 %{buildroot}%{_datadir}/WindowMaker/{autostart.sh,exitscript.sh}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -221,31 +143,26 @@ rm -rf $RPM_BUILD_ROOT
%postun -n WINGs-libs -p /sbin/ldconfig
-%files -f '\(WPrefs\|%{name}\|WINGs\)'.lang
+%files -f '\(WPrefs\|WindowMaker\|WINGs\|wmgenmenu\)'.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS FAQ* README* COPYING*
-%config %{_sysconfdir}/%{name}
+%config %{_sysconfdir}/WindowMaker/
%{_bindir}/*
-%{_libdir}/libWMaker.so.*
+%exclude %{_bindir}/get-*-flags
%{_datadir}/xsessions/WindowMaker.desktop
-%{_datadir}/%{name}/
+%{_datadir}/applications/WindowMaker.desktop
+%{_datadir}/WindowMaker/
%{_datadir}/WPrefs/
%{_mandir}/man1/*.1x*
-%{_mandir}/sk/man1/*.1x*
-%exclude %{_bindir}/get-*-flags
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/get-wutil-flags
-%{_libdir}/libWMaker.so
-%{_libdir}/pkgconfig/wmlib.pc
-%{_includedir}/WMaker.h
+%lang(cs) %{_mandir}/cs/man1/*.1x*
+%lang(sk) %{_mandir}/sk/man1/*.1x*
+%lang(ru) %{_mandir}/ru/man1/*.1x*
%files -n WINGs-libs
%defattr(-,root,root,-)
+%doc WINGs/BUGS WINGs/ChangeLog WINGs/NEWS WINGs/README WINGs/TODO
%{_libdir}/libWINGs.so.*
%{_libdir}/libwraster.so.*
-%{_libdir}/libExtraWINGs.so.*
%{_libdir}/libWUtil.so.*
%{_datadir}/WINGs/
@@ -255,14 +172,23 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/get-wraster-flags
%{_libdir}/libWINGs.so
%{_libdir}/libWUtil.so
-%{_libdir}/libExtraWINGs.so
%{_libdir}/libwraster.so
-%{_libdir}/pkgconfig/wrlib.pc
%{_libdir}/pkgconfig/WINGs.pc
+%{_libdir}/pkgconfig/wrlib.pc
%{_includedir}/WINGs/
%{_includedir}/wraster.h
%changelog
+* Sat Dec 17 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.95.0-0.2.crm.a9e136ec41118f8842f7aa1457b2db83dbde6b7f
+- fix requires
+
+* Sat Dec 10 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.95.0-0.1.crm.a9e136ec41118f8842f7aa1457b2db83dbde6b7f
+- build git snapshot
+- cleanup spec file
+- obsolete WindowMaker-devel package
+
* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.92.0-23
- Rebuild for new libpng
diff --git a/sources b/sources
index 6ca95d1..f0d2afb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-aaac5421b686ed2d3e6ab65229c98097 WindowMaker-0.92.0.tar.bz2
-07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz
+513e90e9b32fedcb615c36f9aeb27de0 wmaker-crm-a9e136ec41118f8842f7aa1457b2db83dbde6b7f.tar.gz
More information about the scm-commits
mailing list