rpms/openbox/F-12 openbox-3.4.11-Xau.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 openbox.spec, 1.49, 1.50 sources, 1.18, 1.19 openbox-3.4.10-focuscycle.patch, 1.1, NONE openbox-3.4.10-gnomesession.patch, 1.2, NONE openbox-3.4.10-obxpropman.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14318

Modified Files:
	.cvsignore openbox.spec sources 
Added Files:
	openbox-3.4.11-Xau.patch 
Removed Files:
	openbox-3.4.10-focuscycle.patch 
	openbox-3.4.10-gnomesession.patch 
	openbox-3.4.10-obxpropman.patch 
Log Message:
- update to 3.4.11.2
- require pyxdg (#590322)
- fix linking with --no-add-needed



openbox-3.4.11-Xau.patch:
 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE openbox-3.4.11-Xau.patch ---
diff -up openbox-3.4.11/Makefile.in.xau openbox-3.4.11/Makefile.in
--- openbox-3.4.11/Makefile.in.xau	2010-02-09 15:10:36.000000000 +0100
+++ openbox-3.4.11/Makefile.in	2010-02-09 15:15:01.000000000 +0100
@@ -763,6 +763,7 @@ tools_gnome_panel_control_gnome_panel_co
 	$(X_CFLAGS)
 
 tools_gnome_panel_control_gnome_panel_control_LDADD = \
+	-lXau \
 	$(X_LIBS)
 
 tools_gnome_panel_control_gnome_panel_control_SOURCES = \
@@ -784,6 +785,7 @@ tools_gdm_control_gdm_control_CPPFLAGS =
 	$(GLIB_CFLAGS)
 
 tools_gdm_control_gdm_control_LDADD = \
+	-lXau \
 	$(X_LIBS) \
 	$(GLIB_LIBS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	8 Jan 2010 11:05:26 -0000	1.15
+++ .cvsignore	17 May 2010 10:00:54 -0000	1.16
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.10.tar.gz
+openbox-3.4.11.2.tar.gz


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/openbox.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- openbox.spec	21 Jan 2010 13:39:23 -0000	1.49
+++ openbox.spec	17 May 2010 10:00:55 -0000	1.50
@@ -1,29 +1,27 @@
 Name:		openbox
-Version:	3.4.10
-Release:	3%{?dist}
+Version:	3.4.11.2
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
 License:	GPLv2+
-URL:		http://icculus.org/openbox
-Source0:	http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
+URL:		http://openbox.org
+Source0:	http://openbox.org/releases/%{name}-%{version}.tar.gz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.9-autostartdir.patch
-Patch1:		openbox-3.4.10-obxpropman.patch
-Patch2:		openbox-3.4.10-focuscycle.patch
-Patch3:		openbox-3.4.10-gnomesession.patch
+Patch1:		openbox-3.4.11-Xau.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{name}-libs = %{version}-%{release}
 
-# The xdg-menu dynamic pipe menu requires the gmenu Python module
-Requires:	gnome-menus
+# required by xdg-menu and xdg-autostart scripts
+Requires:	gnome-menus pyxdg
 
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
@@ -74,9 +72,7 @@ The %{name}-libs package contains shared
 %prep
 %setup -q
 %patch0 -p1 -b .autostartdir
-%patch1 -p1 -b .obxpropman
-%patch2 -p1 -b .focuscycle -F 2
-%patch3 -p1 -b .gnomesession
+%patch1 -p1 -b .Xau
 %patch4 -p1 -b .24bit
 
 
@@ -100,7 +96,7 @@ sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg
 	> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
 
 desktop-file-install --vendor="" \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        --dir=%{buildroot}%{_datadir}/applications \
         %{SOURCE4}
 
 %find_lang %{name}
@@ -150,6 +146,17 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 17 2010 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.11.2-1
+- update to 3.4.11.2
+- require pyxdg (#590322)
+
+* Fri Apr 16 2010 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.11.1-1
+- update to 3.4.11.1
+
+* Tue Feb 09 2010 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.11-1
+- update to 3.4.11
+- fix linking with --no-add-needed
+
 * Thu Jan 21 2010 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.10-3
 - fix gnome-session script again (#552760)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	8 Jan 2010 11:05:26 -0000	1.18
+++ sources	17 May 2010 10:00:55 -0000	1.19
@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-daccf153c7808950313eb00bc250f9bc  openbox-3.4.10.tar.gz
+30e669134fa81df810fe7d1dc59cd931  openbox-3.4.11.2.tar.gz


--- openbox-3.4.10-focuscycle.patch DELETED ---


--- openbox-3.4.10-gnomesession.patch DELETED ---


--- openbox-3.4.10-obxpropman.patch DELETED ---