Browse Source

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

kudoh 12 years ago
parent
commit
9fdb698e8a

+ 9 - 4
l/lxappearance-obconf/lxappearance-obconf-vl.spec

@@ -1,13 +1,13 @@
 Name:           lxappearance-obconf
-Version:        0.0.1
-Release:        2%{?_dist_release}
+Version:        0.0.2
+Release:        1.git20120211%{?_dist_release}
 Summary:        Plugin to configure Openbox inside LXAppearance
 Summary(ja):    LXAppearance 内で OpenBox を設定するためのプラグイン
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.org/
-Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}git20120211.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gettext
@@ -27,12 +27,13 @@ This plugin adds an additional tab called "Window Border" to LXAppearance.
 It is only visible when the plugin is installed and Openbox is in use.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 # dirty hack for outdated/changing LINGUAS file
 #cd po
 #ls *.po | sed 's/.po//g' | sort > LINGUAS
 
 %build
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -57,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb 18 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.0.2.git20120211-1
+- new upstream release
+  - built trunk snapshot
+
 * Sun Jul 31 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.0.1-2
 - rebuilt with new lxappearance
 

+ 24 - 9
o/obconf/obconf-vl.spec

@@ -1,14 +1,18 @@
 Name:		obconf
-Version:	2.0.3
-Release:	4%{?_dist_release}
+Version:	2.0.4
+Release:	1.git20120217%{?_dist_release}
 Summary:	A graphical configuration editor for the Openbox window manager
-Summary(ja):	Openbox ウインドウマネージャのためのグラフィカルな設定エディタ
+Summary(ja):	Openbox ウインドウマネージャのためのグラフィカルな設定エディタ
 
 Group:		User Interface/X
 License:	GPLv2+
-URL:		http://icculus.org/openbox/index.php/ObConf:About
-Source0:	http://icculus.org/openbox/obconf/%{name}-%{version}.tar.gz
+URL:		http://openbox.org/wiki/ObConf:About
+Source0:	http://openbox.org/dist/obconf/%{name}-%{version}git20120217.tar.gz
 Source1:        obconf-2.0.3-ja.po
+Patch0:         fix_freedesktop_compliance.patch
+Patch1:         revert_new_button_layout.patch
+Patch2:         show_specific_tab.dpatch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	openbox >= 3.4
@@ -23,10 +27,10 @@ BuildRequires:	libSM-devel
 ObConf is a graphical configuration editor for the Openbox window manager. 
 
 %description -l ja
-ObConf は Openbox ウインドウマネージャのためのグラフィカルな設定エディタです。
+ObConf は Openbox ウインドウマネージャのためのグラフィカルな設定エディタです。
 
 %prep
-%setup -q
+%setup -q -n obconf
 ## for ja.po
 %{__cp} -f %{SOURCE1} po/ja.po
 pushd po
@@ -36,8 +40,12 @@ echo 'ja' >> LINGUAS
 msgfmt -o ja.gmo ja.po
 popd
 
-%build
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
+%build
+./bootstrap
 %configure
 make %{?_smp_mflags}
 
@@ -73,7 +81,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_bindir}/%{name}
-%{_datadir}/%{name}/  
+%{_datadir}/%{name}/
 %{_datadir}/applications/vine-%{name}.desktop
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/mimelnk/
@@ -81,6 +89,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null
 
 
 %changelog
+* Sat Feb 18 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.0.4-1.git20120217
+- new upstream release
+  - built trunk snapshot
+- added patch0-3 from Debian sid
+- fixed Summary(ja) and description -l ja
+- changed URL and Source0
+
 * Fri Jul 08 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 2.0.3-4
 - rebuilt with current environment
 

+ 10 - 3
t/task-lxde/task-lxde-vl.spec

@@ -1,18 +1,21 @@
 Summary: Virtual package for LXDE install
 Summary(ja): LXDE をインストールするための仮想パッケージ
 Name: task-lxde
-Version: 0.5.0
-Release: 3%{?_dist_release}
+Version: 0.5.5
+Release: 1%{?_dist_release}
 License: public domain
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
 Requires: task-xorg-x11
-Requires: openbox obconf
+Requires: openbox
 Requires: lxappearance lxpanel lxsession menu-cache
 Requires: lxde-common lxde-icon-theme lxinput lxmenu-data
 Requires: pcmanfm gpicview leafpad lxterminal lxtask xarchiver epdfview
+Requires: obconf lxappearance-obconf
+Requires: gnome-icon-theme
+
 Obsoletes: lxsession-lite < 0.3.8
 Obsoletes: lxde-common-data
 
@@ -29,6 +32,10 @@ apt-get を使ってこのパッケージをインストールすることで、
 関連する LXDE パッケージをすべてインストールすることができます。
 
 %changelog
+* Sat Feb 18 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.5-1
+- bumped up
+- added Requires: gnome-icon-theme, lxappearance-obconf
+
 * Sun Jun 13 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.0-3
 - added Requires: task-xorg-x11 (see [VineLinux:1000])