rpms/pekwm/F-13 pekwm-menu.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pekwm.spec, 1.6, 1.7 sources, 1.2, 1.3 pekwm-0.1.5-gcc43.patch, 1.2, NONE pekwm-xdg-menu.py, 1.1, NONE pekwm.desktop, 1.1, NONE pekwm_configure.patch, 1.1, NONE pekwm_menu.patch, 1.1, NONE

Thu Jun 24 18:19:58 UTC 2010

Author: skytux

Update of /cvs/pkgs/rpms/pekwm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1673/F-13

Modified Files:
	.cvsignore pekwm.spec sources 
Added Files:
	pekwm-menu.patch 
Removed Files:
	pekwm-0.1.5-gcc43.patch pekwm-xdg-menu.py pekwm.desktop 
	pekwm_configure.patch pekwm_menu.patch 
Log Message:
* Tue May 11 2010 German A. Racca <gracca at gmail.com> 0.1.12-4
- Fixed BuildRequires to compile from scratch


pekwm-menu.patch:
 menu.in |   19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

--- NEW FILE pekwm-menu.patch ---
--- data/menu.in.orig	2010-04-20 10:57:29.327560081 -0300
+++ data/menu.in	2010-04-20 14:09:47.653296490 -0300
@@ -10,7 +10,6 @@
 	Separator {}
 
 	Submenu = "Editors" {
-		Entry = "vi" { Actions = "Exec $TERM -title vi -e vi &" }
 		Entry = "vim" { Actions = "Exec $TERM -title vim -e vim &" }
 		Entry = "gvim" { Actions = "Exec gvim &" }
 		Entry = "Emacs" { Actions = "Exec emacs &" }
@@ -28,29 +27,23 @@
 		Entry = "Amarok" { Actions = "Exec amarok &" }
 		Entry = "Quod Libet" { Actions = "Exec quodlibet &" }
 		Entry = "Xmms" { Actions = "Exec xmms &" }
-		Entry = "MPlayer" { Actions = "Exec gmplayer &" }
+		Entry = "MPlayer" { Actions = "Exec gnome-mplayer &" }
 		Entry = "Xine" { Actions = "Exec xine &" }
 		Entry = "xawtv" { Actions = "Exec xawtv &" }
-		Entry = "Ogle" { actions = "exec ogle &" }
+		Entry = "Totem" { actions = "exec totem &" }
 		Entry = "alsamixer" { Actions = "Exec $TERM -title alsamixer -e alsamixer &" }
 	}
 	Submenu = "Utils" {
-		Entry = "XCalc" { Actions = "Exec xcalc &" }
-		Entry = "XMan" { Actions = "Exec xman &" }
+		Entry = "Calculator" { Actions = "Exec gcalctool &" }
 		Entry = "Xpdf" { Actions = "Exec xpdf &" }
-		Entry = "GGv" { Actions = "Exec ggv &" }
 		Entry = "Evince" { Actions = "Exec evince &" }
 		Entry = "gucharmap" { Actions = "Exec gucharmap &" }
 		Entry = "Gkrellm" { Actions = "Exec gkrellm &" }
-		Entry = "Gkrellm2" { Actions = "Exec gkrellm2 &" }
-		Entry = "ROX Filer" { Actions = "Exec rox &" }
 	}
 	Submenu = "WWW" {
 		Entry = "Dillo" { Actions = "Exec dillo &" }
 		Entry = "Konqueror" { Actions = "Exec konqueror &" }
-		Entry = "Mozilla" { Actions = "Exec mozilla &" }
 		Entry = "Firefox" { Actions = "Exec firefox &" }
-		Entry = "Mozilla Firefox" { Actions = "Exec mozilla-firefox &" }
 	}
 	Submenu = "FTP" {
 		Entry = "gftp" { Actions = "Exec gftp &" }
@@ -58,19 +51,17 @@
 	}
 	Submenu = "Communication" {
 		Entry = "Mutt" { Actions = "Exec $TERM -title mutt -e mutt &" }
-		Entry = "Pine" { Actions = "Exec $TERM -title pine -e pine &" }
+		Entry = "Alpine" { Actions = "Exec $TERM -title alpine -e alpine &" }
 		Entry = "Thunderbird" { Actions = "Exec thunderbird &" }
-		Entry = "Mozilla Thunderbird" { Actions = "Exec mozilla-thunderbird &" }
 		Entry = "Evolution" { Actions = "Exec evolution &" }
 		Entry = "KMail" { Actions = "Exec kmail &" }
-		Entry = "Gaim" { Actions = "Exec gaim &" }
+		Entry = "Pidgin" { Actions = "Exec pidgin &" }
 		Entry = "Irssi" { Actions = "Exec $TERM -title irssi -e irssi &" }
 		Entry = "Kopete" { Actions = "Exec kopete &" }
 	}
 	Submenu = "Office" {
 		Entry = "KOffice Workspace" { Actions = "Exec koshell &" }
 		Entry = "OpenOffice" { Actions = "Exec ooffice &" }
-		Entry = "StarOffice" { Actions = "Exec soffice &" }
 	}
 	Submenu = "Development" {
 		Entry = "Anjuta" { Actions = "Exec anjuta &" }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pekwm/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Oct 2006 01:38:43 -0000	1.2
+++ .cvsignore	24 Jun 2010 18:19:57 -0000	1.3
@@ -1 +1 @@
-pekwm-0.1.5.tar.bz2
+pekwm-0.1.12.tar.gz


Index: pekwm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pekwm/F-13/pekwm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pekwm.spec	3 Mar 2009 23:12:08 -0000	1.6
+++ pekwm.spec	24 Jun 2010 18:19:58 -0000	1.7
@@ -1,128 +1,119 @@
-Name:           pekwm
-Version:        0.1.5
-Release:        10%{?dist}
-Summary:        The Pek Window Manager
-
-Group:          User Interface/Desktops
-# No version specified.
-License:        GPL+
-URL:            http://pekwm.org
-Source0:        http://pekwm.org/files/%{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
-Source2:        pekwm-xdg-menu.py
-Patch0:         pekwm_configure.patch
-Patch2:         pekwm_menu.patch
-Patch3:		pekwm-0.1.5-gcc43.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libX11-devel, xorg-x11-proto-devel, libXft-devel,libXpm-devel
-BuildRequires:  libXrandr-devel, libXinerama-devel, libpng-devel, libjpeg-devel
-BuildRequires:  pcre-devel
-Requires:       pyxdg, procps, xprop
+Name:		pekwm
+Version:	0.1.12
+Release:	4%{?dist}
+Summary:	A small and flexible window manager
+
+Group:		User Interface/Desktops
+License:	GPLv2+
+URL:		http://www.pekwm.org/
+Source0:	http://www.pekwm.org/projects/pekwm/files/%{name}-%{version}.tar.gz
+Patch0:		%{name}-menu.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libX11-devel libpng-devel libXrandr-devel
+BuildRequires:	libXft-devel libXext-devel libXinerama-devel
+BuildRequires:	libXpm-devel libjpeg-devel libICE-devel libSM-devel
 
 %description
-A lightweight window manager with tabs based on aewm++.
+Pekwm is a window manager that once up on a time was based on the aewm++ window
+manager, but it has evolved enough that it no longer resembles aewm++ at all.
+It has a much expanded feature-set, including window grouping (similar to ion,
+pwm, or fluxbox), autoproperties, xinerama, keygrabber that supports keychains,
+and much more.
+
+   * Lightweight and Unobtrusive, a window manager shouldn't be noticed.
+   * Very configurable, we all work and think in different ways.
+   * Automatic properties, for all the lazy people, make things appear as they
+should when starting applications.
+   * Chainable Keygrabber, usability for everyone. 
 
 %prep
 %setup -q
-%patch0
-%patch2
-%patch3 -p1
-
-sed -i s,"<BINDIR>",%{_bindir},g data/menu.in
-sed -i s,"XftDrawString8","XftDrawStringUtf8", src/PFont.cc
+# Exclude menu apps that are not in Fedora or are not free software
+%patch0 -p0 -b .orig
 
 %build
-%configure --enable-shape \
-           --enable-xinerama \
-           --enable-xrandr \
-           --enable-xft \
-           --enable-image-xpm \
-           --enable-image-jpeg \
-           --enable-image-png  \
-           --enable-menus \
-           --enable-harbour \
-           --enable-pcre \
-           --x-includes=%{_includedir} \
-           --x-libraries=%{_libdir} 
-
+%configure
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT scriptsdir=%{_bindir}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
-install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/xsessions/
-install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_bindir}/pekwm-xdg-menu
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Create desktop file
+mkdir -p %{buildroot}%{_datadir}/xsessions/
+cat << EOF > %{buildroot}%{_datadir}/xsessions/%{name}.desktop
+[Desktop Entry]
+Name=PekWM
+Comment=Very small and fast window manger
+Exec=pekwm
+TryExec=pekwm
+Type=XSession
+EOF
+
+# Delete makefiles from contrib folder
+find contrib/Makefile* -type f | xargs rm -rf || true
+find contrib/lobo/Makefile* -type f | xargs rm -rf || true
+
+# Rearrange the contents of contrib folder
+mv contrib/lobo/* contrib/
+rm -rf contrib/lobo
+
+# Fix permissions to include scripts in %%doc
+find contrib/pekwm_autoprop.pl -type f | xargs chmod 0644 || true
+find contrib/pekwm_menu_config.pl -type f | xargs chmod 0644 || true
 
+%clean
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,755)
-%doc AUTHORS ChangeLog
-%{_bindir}/pekwm
-%{_bindir}/pekwm-xdg-menu
-%{_bindir}/pekwm_themeset.pl
-%{_bindir}/pekwm_themeset.sh
-%{_bindir}/pekwm_ws_menu.pl
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/themes/
-%dir %{_datadir}/%{name}/themes/default
-%{_datadir}/%{name}/themes/default/theme
-%dir %{_sysconfdir}/%{name}
-%{_datadir}/xsessions/%{name}.desktop
-%config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/start
-%config(noreplace) %{_sysconfdir}/%{name}/menu
-%config(noreplace) %{_sysconfdir}/%{name}/keys
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog ChangeLog.aewm++ ChangeLog.until-0.1.6 LICENSE NEWS README contrib/
+%{_bindir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/autoproperties
 %config(noreplace) %{_sysconfdir}/%{name}/config
+%config(noreplace) %{_sysconfdir}/%{name}/keys
+%config(noreplace) %{_sysconfdir}/%{name}/menu
 %config(noreplace) %{_sysconfdir}/%{name}/mouse
 %config(noreplace) %{_sysconfdir}/%{name}/vars
-
+%config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/start
+%{_datadir}/%{name}/
+%{_mandir}/man1/%{name}.*
+%{_datadir}/xsessions/%{name}.desktop
 
 %changelog
-* Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 0.1.5-10
-- include cstdio for std::scanf
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue May 11 2010 German A. Racca <gracca at gmail.com> 0.1.12-4
+- Fixed BuildRequires to compile from scratch
 
-* Wed Sep 17 2008 Matt Domsch <mdomsch at fedoraproject.org> - 0.1.5-8
-- fix FTBFS BZ#434089
+* Sun May 09 2010 German A. Racca <gracca at gmail.com> 0.1.12-3
+- Deleted makefiles form contrib folder
+- Rearranged contents in contrib folder
+
+* Mon Apr 26 2010 German A. Racca <gracca at gmail.com> 0.1.12-2
+- Added %%{dist} tag
+- Fixed patch
+- Added contrib stuff to docs
+
+* Tue Apr 20 2010 German A. Racca <gracca at gmail.com> 0.1.12-1
+- New version 0.1.12
+- Fixed timestamp for tarball source
+- Added BuildRoot tag
+- Fixed BuildRequires
+- Added menu patch
+- Added INSTALL="install -p" to preserve timestamps
+- Corrected type in xsession file
+- Added ChangeLog.aewm++ and ChangeLog.until-0.1.6 to doc files
+- Own directory %%{_datadir}/%%{name}
+- Marqued 'start' as config file
+
+* Sat Feb 20 2010 German A. Racca <gracca at gmail.com> 0.1.11-3
+- Changed Summary
+- Changed BuildRequires
+- Modified desktop file
+- Added exec attr to 'start' file
 
-* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.5-7
-- fix license tag
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.5-6
-- Autorebuild for GCC 4.3
-
-* Tue Oct 17 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-5
-- Add UTF-8 support per: 
-    http://adresh.com/pekwm/dev_docs/html/faq/answers.html#FAQ-1546
-
-* Tue Oct 17 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-4
-- Add dir datadir/name/themes/ for ownership
-- Add BR for pcre
-- Add Requires for use of pkill in a provided script
-- Change summary & add a . to the description
-- Change Requires to xprop and not xorg-x11-utils
-
-* Mon Oct 16 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-3
-- Move default configs into sysconfdir
-- Fix double listing of sysconf stuff
-- Place all scripts into bindir
-- fix typo in menu_patch
-
-* Fri Oct 13 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-2
-- Add fedora compliant menu generator.
-- Remake provided menu to use the pekwm-xdg-menu
-- Add requires for pyxdg
-- Rebuilt with pcre
-- Add BR for jpeg, png, and xinerama
+* Fri Jan 15 2010 German A. Racca <gracca at gmail.com> 0.1.11-2
+- Added Source0 to spec file
 
-* Mon Oct 09 2006 Michael Rice <errr[AT]errr-online.com> - 0.1.5-1
-- Initial RPM release
+* Thu Dec 17 2009 German A. Racca <gracca at gmail.com> 0.1.11-1
+- Initial release of RPM package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pekwm/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Oct 2006 01:38:43 -0000	1.2
+++ sources	24 Jun 2010 18:19:58 -0000	1.3
@@ -1 +1 @@
-fe3e0d77250d27963991994f83ccb4ea  pekwm-0.1.5.tar.bz2
+1f7f9ed32cc03f565a3ad30fd6045c1f  pekwm-0.1.12.tar.gz


--- pekwm-0.1.5-gcc43.patch DELETED ---


--- pekwm-xdg-menu.py DELETED ---


--- pekwm.desktop DELETED ---


--- pekwm_configure.patch DELETED ---


--- pekwm_menu.patch DELETED ---

