new upstream and rebuilt

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

i/imlib2/imlib2-vl.spec

@@ -1,8 +1,8 @@
 Summary: Powerful image loading and rendering library
 Summary(ja): 強力な画像ロード & レンダリングライブラリ
 Name: imlib2
-Version: 1.4.6
-Release: 2%{?_dist_release}
+Version: 1.4.7
+Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.enlightenment.org/Libraries/Imlib2
@@ -17,13 +17,9 @@ BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: freetype2-devel
 BuildRequires: libid3tag-devel
-%if %{?_dist_release} == "vl4"
-BuildRequires: XOrg-devel
-BuildRequires: autoconf libtool
-%else
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
-%endif
+
 Requires: %{name}-loaders = %{version}
 
 %description
@@ -81,14 +77,8 @@ loader_id3 - id3 tag image loader/saver
 
 %prep
 %setup -q
-
 #%patch1 -p1
 
-%if %{?_dist_release} == "vl4"
-libtoolize --force --copy
-autoreconf -f
-%endif
-
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -134,6 +124,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/imlib2/loaders/*.so
 
 %changelog
+* Sun Nov 15 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.4.7-1
+- new upstream release
+- deleted vl4 conditional branch
+
 * Fri Jul 18 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 1.4.6-2
 - rebuilt with libpng-1.6.12
 

o/obconf/obconf-vl.spec

@@ -1,6 +1,6 @@
 Name:		obconf
 Version:	2.0.4
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 Summary:	A graphical configuration editor for the Openbox window manager
 Summary(ja):	Openbox ウインドウマネージャーのためのグラフィカルな設定エディター
 
@@ -88,6 +88,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null
 
 
 %changelog
+* Sun Nov 15 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.0.4-3
+- rebuilt with openbox-3.6
+
 * Fri Jul 11 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.0.4-2
 - rebuild with openbox-3.5
 - use 2.0.4 release tar ball

o/openbox/openbox-vl.spec

@@ -1,26 +1,17 @@
 Name:		openbox
-Version:	3.5.2
-Release:	2%{?_dist_release}
+Version:	3.6.1
+Release:	1%{?_dist_release}
 Summary:	A highly configurable and standards-compliant X11 window manager
 Summary(ja):	高度に設定可能な標準準拠の X11 ウィンドウマネージャ
 
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://openbox.org/
-Source0:	http://openbox.org/releases/%{name}-%{version}.tar.gz
+Source0:	http://openbox.org/releases/%{name}-%{version}.tar.xz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source3:	menu.xml
-#Source4:	openbox.desktop
-Source5:	terminals.menu
-
-#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
-
+Source4:	terminals.menu
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -86,11 +77,6 @@ The %{name}-libs package contains shared libraries used by %{name}.
 
 %prep
 %setup -q
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
 autoreconf
 
 %build
@@ -113,12 +99,8 @@ install setlayout %{buildroot}%{_bindir}
 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}
 	
-install -m644 -p %{SOURCE5} \
+install -m644 -p %{SOURCE4} \
 	%{buildroot}%{_sysconfdir}/xdg/%{name}/terminals.menu
 
 # 'make install' misses these two, so we install them manually
@@ -177,6 +159,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Nov 15 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> - 3.6.1-1
+- new upstream release
+- changet source archive type gz to xz
+- fixed Source3
+  - deleted unused menu
+- cleaned up spec
+  - renumbered %%{Source} files
+
 * Fri Jul 11 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 3.5.2-2
 - fix file list (libs,devel)
   - remove .so from -libs