Browse Source

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5615 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 12 years ago
parent
commit
5eaceb850a
1 changed files with 13 additions and 3 deletions
  1. 13 3
      o/openbox/openbox-vl.spec

+ 13 - 3
o/openbox/openbox-vl.spec

@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.5.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	A highly configurable and standards-compliant X11 window manager
 Summary(ja):	高度に設定可能な標準準拠の X11 ウィンドウマネージャ
 
@@ -13,9 +13,11 @@ Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	openbox.desktop
 Source5:	terminals.menu
+Source6:	openbox.gnome-session
 
-Patch0:	 openbox-3.4.10-obxpropman.patch
+#Patch0:	 openbox-3.4.10-obxpropman.patch
 Patch1:	 openbox-3.4.11.2-gnomesession.patch
+Patch2:	 07_fix_xml_load_file.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -79,8 +81,8 @@ The %{name}-libs package contains shared libraries used by %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .obxpropman
 %patch1 -p1
+%patch2 -p1
 autoreconf
 
 %build
@@ -111,6 +113,9 @@ desktop-file-install --vendor="" \
 install -m644 -p %{SOURCE5} \
 	%{buildroot}%{_sysconfdir}/xdg/%{name}/terminals.menu
 
+install -m644 -D %{SOURCE6} \
+	%{buildroot}%{_datadir}/gnome-session/sessions/gnome-openbox.session
+
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/*.la
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
@@ -136,6 +141,7 @@ rm -rf %{buildroot}
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/wm-properties/
+%{_datadir}/gnome-session/sessions/gnome-openbox.session
 %{_datadir}/xsessions/%{name}*.desktop
 %{_libexecdir}/openbox-*
 %{_mandir}/man1/*
@@ -158,6 +164,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 11 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.5.0-2
+- replaced Source2 to newer from Fedora rawhide
+- added Patch2 from Debian sid to fix load xml files
+
 * Fri Aug 26 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.5.0-1
 - new upstream release
 - dropt Patch0,7,10,11