Browse Source

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

kudoh 15 years ago
parent
commit
88b1a5decf
2 changed files with 25 additions and 10 deletions
  1. 16 6
      o/openbox/openbox-vl.spec
  2. 9 4
      x/xarchiver/xarchiver-vl.spec

+ 16 - 6
o/openbox/openbox-vl.spec

@@ -1,13 +1,13 @@
 Name:		openbox
 Name:		openbox
-Version:	3.4.11
+Version:	3.4.11.1
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 Summary:	A highly configurable and standards-compliant X11 window manager
 Summary:	A highly configurable and standards-compliant X11 window manager
 Summary(ja):	高度に設定可能な標準準拠の X11 ウィンドウマネージャ
 Summary(ja):	高度に設定可能な標準準拠の X11 ウィンドウマネージャ
 
 
 Group:		User Interface/Desktops
 Group:		User Interface/Desktops
 License:	GPLv2+
 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
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source2:	xdg-menu
 Source3:	menu.xml
 Source3:	menu.xml
@@ -16,7 +16,7 @@ Source4:	openbox.desktop
 Patch0:		openbox-3.4.9-autostartdir.patch
 Patch0:		openbox-3.4.9-autostartdir.patch
 Patch1:		openbox-3.4.8-gdm.patch
 Patch1:		openbox-3.4.8-gdm.patch
 Patch3:		openbox-3.4.7.2-autostartid.patch
 Patch3:		openbox-3.4.7.2-autostartid.patch
-Patch6:         05_fix_gnome-settings-daemon_path.patch
+#Patch6:         05_fix_gnome-settings-daemon_path.patch
 Patch7:		openbox-3.4.7.2-24bit.patch
 Patch7:		openbox-3.4.7.2-24bit.patch
 Patch9:		openbox-3.4.10-obxpropman.patch
 Patch9:		openbox-3.4.10-obxpropman.patch
 Patch10:	openbox-3.4.11-Xau.patch
 Patch10:	openbox-3.4.11-Xau.patch
@@ -26,11 +26,14 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 
 
 BuildRequires:	gettext
 BuildRequires:	gettext
+BuildRequires:	glib2-devel >= 2.14.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	desktop-file-utils
 BuildRequires:	pango-devel
 BuildRequires:	pango-devel
 BuildRequires:	startup-notification-devel
 BuildRequires:	startup-notification-devel
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 2.6.0
+BuildRequires:	libSM-devel
 BuildRequires:	libXcursor-devel
 BuildRequires:	libXcursor-devel
+BuildRequires:	libXfixes-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXrandr-devel
 BuildRequires:	libXrandr-devel
 BuildRequires:	libXinerama-devel
 BuildRequires:	libXinerama-devel
@@ -81,7 +84,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %patch0 -p1 -b .autostartdir
 %patch0 -p1 -b .autostartdir
 %patch1 -p1 -b .gdm
 %patch1 -p1 -b .gdm
 %patch3 -p1 -b .autostartid
 %patch3 -p1 -b .autostartid
-%patch6
+#%patch6
 %patch7 -p1 -b .24bit
 %patch7 -p1 -b .24bit
 %patch9 -p1 -b .obxpropman
 %patch9 -p1 -b .obxpropman
 %patch10 -p1 -b .Xau
 %patch10 -p1 -b .Xau
@@ -156,6 +159,13 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Fri May 7 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.4.11.1-1
+- new upstream release
+- changed URL and Source0
+- dropt Patch6
+- added BuildRequires: libXfixes-devel, libSM-devel
+- changed BuildRequires: glib2-devel >= 2.14.0, libxml2-devel >= 2.6.0
+
 * Thu Feb 11 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.4.11-1
 * Thu Feb 11 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.4.11-1
 - new upstream release
 - new upstream release
 - added Patch10 from Fedora
 - added Patch10 from Fedora

+ 9 - 4
x/xarchiver/xarchiver-vl.spec

@@ -1,8 +1,8 @@
 Name:           xarchiver
 Name:           xarchiver
 Version:        0.5.2
 Version:        0.5.2
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 Summary:        Archive manager for Xfce
 Summary:        Archive manager for Xfce
-Summary(ja):        Xfceのアーカイブマネージャ
+Summary(ja):    Xfceのアーカイブマネージャ
 
 
 Group:          Applications/Archiving
 Group:          Applications/Archiving
 License:        GPLv2+
 License:        GPLv2+
@@ -11,9 +11,11 @@ Source0:        http://downloads.sourceforge.net/xarchiver/xarchiver-%{version}.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
 BuildRequires:  gtk2-devel, libxml2-devel, gettext, desktop-file-utils
 BuildRequires:  gtk2-devel, libxml2-devel, gettext, desktop-file-utils
+BuildRequires:  glib2-devel >= 2.10.0 intltool >= 0.31
 #BuildRequires:  xfce4-dev-tools >= 4.3.90.2
 #BuildRequires:  xfce4-dev-tools >= 4.3.90.2
 Requires:       binutils, bzip2, cpio, gzip, xdg-utils, tar, unzip, zip
 Requires:       binutils, bzip2, cpio, gzip, xdg-utils, tar, unzip, zip
 
 
+
 %description
 %description
 Xarchiver is a lightweight GTK2 only frontend for manipulating 7z, bzip2, 
 Xarchiver is a lightweight GTK2 only frontend for manipulating 7z, bzip2, 
 gzip, iso, rar, lha, tar, zip, RPM and deb files. It allows you to create 
 gzip, iso, rar, lha, tar, zip, RPM and deb files. It allows you to create 
@@ -26,7 +28,6 @@ archives in the 7z, rar, and zip formats are supported.
 # fix spurious executable permissions of some debug files
 # fix spurious executable permissions of some debug files
 chmod -x src/mime.*
 chmod -x src/mime.*
 
 
-
 %build
 %build
 %configure
 %configure
 make %{?_smp_mflags}
 make %{?_smp_mflags}
@@ -45,7 +46,7 @@ install -p -m 755 xarchiver.tap \
 %find_lang %{name}
 %find_lang %{name}
 desktop-file-install --vendor vine                         \
 desktop-file-install --vendor vine                         \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category="Compression"                            \
+        --add-category="Utility"                            \
         --delete-original                                       \
         --delete-original                                       \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
@@ -88,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Fri May 7 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.2-3
+- fixed desktop-file-install --add-category section
+- added BuildRequires: glib2-devel >= 2.10.0 intltool >= 0.31
+
 * Sun Apr 5 2009 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.2-2vl5
 * Sun Apr 5 2009 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.2-2vl5
 - fixed BuildRoot tag
 - fixed BuildRoot tag