|
|
@@ -1,6 +1,6 @@
|
|
|
Name: openbox
|
|
|
-Version: 3.5.0
|
|
|
-Release: 4%{?_dist_release}
|
|
|
+Version: 3.5.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Summary: A highly configurable and standards-compliant X11 window manager
|
|
|
Summary(ja): 高度に設定可能な標準準拠の X11 ウィンドウマネージャ
|
|
|
|
|
|
@@ -11,16 +11,15 @@ 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
|
|
|
+#Source4: openbox.desktop
|
|
|
Source5: terminals.menu
|
|
|
-Source6: openbox.gnome-session
|
|
|
|
|
|
#Patch0: openbox-3.4.10-obxpropman.patch
|
|
|
-Patch1: openbox-3.4.11.2-gnomesession.patch
|
|
|
-Patch2: 07_fix_xml_load_file.patch
|
|
|
-Patch3: 666676_wrong_undecorated_window_placement.patch
|
|
|
-Patch4: 90_fix_link_obt.patch
|
|
|
-Patch5: 675991_fix_crash_from_gtk3_apps.patch
|
|
|
+#Patch1: openbox-3.4.11.2-gnomesession.patch
|
|
|
+#Patch2: 07_fix_xml_load_file.patch
|
|
|
+#Patch3: 666676_wrong_undecorated_window_placement.patch
|
|
|
+#Patch4: 90_fix_link_obt.patch
|
|
|
+#Patch5: 675991_fix_crash_from_gtk3_apps.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
@@ -32,6 +31,8 @@ BuildRequires: glib2-devel >= 2.14.0
|
|
|
BuildRequires: desktop-file-utils
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: startup-notification-devel
|
|
|
+BuildRequires: imlib2-devel
|
|
|
+BuildRequires: librsvg2-devel
|
|
|
BuildRequires: libxml2-devel >= 2.6.0
|
|
|
BuildRequires: libSM-devel
|
|
|
BuildRequires: libXau-devel
|
|
|
@@ -85,11 +86,11 @@ The %{name}-libs package contains shared libraries used by %{name}.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch1 -p1
|
|
|
-%patch2 -p1
|
|
|
-%patch3 -p1
|
|
|
-%patch4 -p1
|
|
|
-%patch5 -p1
|
|
|
+#%patch1 -p1
|
|
|
+#%patch2 -p1
|
|
|
+#%patch3 -p1
|
|
|
+#%patch4 -p1
|
|
|
+#%patch5 -p1
|
|
|
autoreconf
|
|
|
|
|
|
%build
|
|
|
@@ -113,15 +114,19 @@ install -p %{SOURCE2} %{buildroot}%{_libexecdir}/openbox-xdg-menu
|
|
|
sed 's|_LIBEXECDIR_|%{_libexecdir}|g' < %{SOURCE3} \
|
|
|
> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
|
|
|
|
|
|
-desktop-file-install --vendor="" \
|
|
|
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
|
|
|
- %{SOURCE4}
|
|
|
+#desktop-file-install --vendor="" \
|
|
|
+# --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
|
|
|
+# %{SOURCE4}
|
|
|
|
|
|
install -m644 -p %{SOURCE5} \
|
|
|
%{buildroot}%{_sysconfdir}/xdg/%{name}/terminals.menu
|
|
|
|
|
|
-install -m644 -D %{SOURCE6} \
|
|
|
- %{buildroot}%{_datadir}/gnome-session/sessions/gnome-openbox.session
|
|
|
+# 'make install' misses these two, so we install them manually
|
|
|
+install -m644 -D data/gnome-session/openbox-gnome.session \
|
|
|
+ %{buildroot}%{_datadir}/gnome-session/sessions/openbox-gnome.session
|
|
|
+install -m644 -D data/gnome-session/openbox-gnome-fallback.session \
|
|
|
+ %{buildroot}%{_datadir}/gnome-session/sessions/openbox-gnome-fallback.session
|
|
|
+
|
|
|
|
|
|
%find_lang %{name}
|
|
|
rm -f %{buildroot}%{_libdir}/*.la
|
|
|
@@ -148,7 +153,8 @@ rm -rf %{buildroot}
|
|
|
%{_datadir}/themes/*/
|
|
|
%{_datadir}/pixmaps/%{name}.png
|
|
|
%{_datadir}/gnome/wm-properties/
|
|
|
-%{_datadir}/gnome-session/sessions/gnome-openbox.session
|
|
|
+%{_datadir}/gnome-session/sessions/openbox-gnome.session
|
|
|
+%{_datadir}/gnome-session/sessions/openbox-gnome-fallback.session
|
|
|
%{_datadir}/xsessions/%{name}*.desktop
|
|
|
%{_libexecdir}/openbox-*
|
|
|
%{_mandir}/man1/*
|
|
|
@@ -171,6 +177,11 @@ rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat May 31 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.5.2-1
|
|
|
+- new upstream release
|
|
|
+- replaced Source2 to newer from Fedora rawhide
|
|
|
+- added BuildRequires: imlib2-devel, librsvg2-devel
|
|
|
+
|
|
|
* Wed Jul 25 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.5.0-4
|
|
|
- added Patch3,4,5 from Debian sid
|
|
|
|
|
|
@@ -335,7 +346,7 @@ rm -rf %{buildroot}
|
|
|
- Allow building with startup-notification as an rpmbuild option (though it is
|
|
|
disabled by default as recommended by upstream).
|
|
|
|
|
|
-* Sun Sep 09 2006 Peter Gordon <peter@thecodergeek.com> - 3.3.1-1
|
|
|
+* Sat Sep 09 2006 Peter Gordon <peter@thecodergeek.com> - 3.3.1-1
|
|
|
- Update to new 3.3.1 from upstream
|
|
|
|
|
|
* Sun Aug 27 2006 Peter Gordon <peter@thecodergeek.com> - 3.3-3
|
kudoh