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

m/mcomix/mcomix-vl.spec

@@ -4,7 +4,7 @@ Summary:	customizable image viewer that specifically designed to handle comic bo
 Summary(ja): 	漫画向けに特化してデザインされたカスタム可能なイメージビューワ
 Name:		mcomix
 Version:	0.91
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Source0:	mcomix-%{version}.tar.bz2
 Source1:	mcomix_ja.po
 
@@ -16,6 +16,7 @@ Requires:	pygtk2 >= 2.12, python-imaging >= 1.1.5, libjpeg-turbo
 Requires:	python >= 2.5
 
 BuildRequires:	python  >= 2.5
+BuildRequires:	python-setuptools
 BuildRequires:	pygtk2-devel python-imaging
 BuildRequires:	gettext
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -74,6 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/*
 
 %changelog
+* Sun May 22 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.91-2
+- added BuildRequires:	python-setuptools
+
 * Wed May 11 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.91-1
 - new upstream release
 - changed Lisence tag

p/python-boto/python-boto-vl.spec

@@ -4,7 +4,7 @@
 Summary:	A simple lightweight interface to Amazon Web Services
 Summary(ja):	シンプル・軽量な Amazon Web サービスへのインターフェイス
 Name:		python-boto
-Version:	2.0b3
+Version:	2.0b4
 Release:	1%{?_dist_release}
 License:	MIT
 Group:		Development/Languages
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sun May 22 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.0b4-1
+- new upstream release
+
 * Mon Oct 18 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.0b3-1
 - new upstream release
 

w/wicd/wicd-vl.spec

@@ -4,35 +4,38 @@ Summary: A wireless and wired network manager
 Summary(ja): 無線・有線ネットワークマネージャ
 Name: wicd
 Version: 1.7.0
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 Source0: %{name}-%{version}.tar.bz2
 # from ATrpms package
 Patch0:  wicd-1.7.0-init-script.patch
-
 Patch1:  wicd-desktop.patch
+
+# from Debian
 Patch2:  18-dont_run_unexpected_files_in_scripts.patch
 Patch3:  27-fix_resolv.conf_perms.patch
+Patch4:  03-fix_typo_wicd-cli.patch
+Patch5:  08-fix_help_message.patch
+Patch6:  22-fix_deprecation.patch
+Patch7:  23-fix_script_macro_expansion.patch
+Patch8:  32-prefer_gksu.patch
 
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://wicd.net
+BuildArch: noarch
 
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: python >= 2.4 python-devel >= 2.4
 BuildRequires: python-setuptools
 
-Requires: python >= 2.4 ethtool net-tools wpa_supplicant pm-utils wireless-tools
-Requires: dhclient iproute dbus-python
-Requires: pygtk2 >= 2.10
-Requires: python-urwid >= 0.9.8.3
-Requires: gksu
+Requires: pm-utils >= 1.2.4
 
-Requires(post):   chkconfig
-Requires(preun):  chkconfig
-Requires(preun):  /sbin/service
-Requires(postun): /sbin/service
+#Requires(post):   chkconfig
+#Requires(preun):  chkconfig
+#Requires(preun):  /sbin/service
+#Requires(postun): /sbin/service
 
 Conflicts: NetworkManager
 
@@ -45,6 +48,56 @@ to easily add encryption methods used.  It ships with some common
 encryption types, such as WPA and WEP. Wicd will automatically
 connect at startup to any preferred network within range.
 
+%package common
+Summary: Wicd common files
+Summary(ja): Wicd の共通ファイル
+Group: System Environment/Base
+BuildArch: noarch
+Requires: dbus
+Requires: dbus-python
+Requires: dhclient
+Requires: ethtool
+Requires: iproute
+Requires: logrotate
+Requires: net-tools
+Requires: pm-utils
+Requires: wireless-tools
+Requires: wpa_supplicant
+
+Requires(post):   chkconfig
+Requires(preun):  chkconfig
+Requires(preun):  /sbin/service
+Requires(postun): /sbin/service
+#Requires(preun):  initscripts
+#Requires(postun): initscripts
+
+%description common
+This package provides the main wicd daemon and the wicd-cli front-end.
+
+%package curses
+Summary: Curses client for Wicd
+Summary(ja): Wicd の Curse クライアント
+Group: Applications/System
+BuildArch: noarch
+Requires: %{name}-common = %{version}-%{release}
+Requires: python-urwid >= 0.9.8.3
+
+%description curses
+Client program for wicd that uses a curses interface.
+
+%package gtk
+Summary: GTK+ client for Wicd
+Summary(ja): Wicd の GTK+ クライアント
+Group: Applications/Internet
+BuildArch: noarch
+Requires: %{name}-common = %{version}-%{release}
+Requires: pygtk2 >= 2.10
+Requires: pygtk2-libglade >= 2.10
+Requires: gksu
+
+%description gtk
+Client program for wicd that uses a GTK+ interface.
+
 
 %prep
 %setup -q
@@ -52,6 +105,11 @@ connect at startup to any preferred network within range.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %{__sed} -i 's/\r//' wicd/logfile.py
 
@@ -66,6 +124,7 @@ connect at startup to any preferred network within range.
        --resume=%{_sysconfdir}/acpi/resume.d \
        --suspend=%{_sysconfdir}/acpi/suspend.d \
        --docdir=%{_docdir}/%{name}-%{version} \
+       --log %{_localstatedir}/log \
        --no-install-kde \
        --no-install-docs
 
@@ -76,23 +135,33 @@ rm -rf %{buildroot}
 python setup.py install -O1 --skip-build --root=%{buildroot}
 install -D init/redhat/%{name} %{buildroot}%{_initddir}/%{name}
 
-desktop-file-install --vendor "" --dir %{buildroot}%{_datadir}/autostart/ other/wicd-tray.desktop
+find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm
+
+desktop-file-install \
+    --remove-category="Application" \
+    --delete-original \
+    --dir=%{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/wicd.desktop
+
+desktop-file-install \
+    --dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
+    %{buildroot}%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 
 %find_lang %{name}
 
-%post
+%post common
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/service %{name} restart >/dev/null 2>&1
 /sbin/chkconfig --add %{name}
 /sbin/chkconfig --level 345 %{name} on
 
-%preun
+%preun common
 if [ $1 = 0 ] ; then
      /sbin/service %{name} stop >/dev/null 2>&1
      /sbin/chkconfig --del %{name}
 fi
 
-%postun
+%postun common
 if [ "$1" -ge "1" ] ; then
     /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
@@ -102,27 +171,47 @@ if [ $1 -eq 0 ] ; then
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%posttrans
+%post gtk
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun gtk
+if [ $1 -eq 0 ]; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans gtk
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %clean
 [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root)
 %doc AUTHORS CHANGES INSTALL LICENSE NEWS README other/WHEREAREMYFILES
-%{_bindir}/wicd-*
+%{_libdir}/pm-utils/sleep.d/91wicd
+
+%files common -f %{name}.lang
+%{_bindir}/wicd-cli
+%{_bindir}/wicd-client
 %{python_sitelib}/wicd
 %{python_sitelib}/*.egg-info
-%{_datadir}/wicd
-%{_datadir}/pixmaps/wicd*
-%{_datadir}/icons/hicolor/*/apps/wicd-*.png
-%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 %{_datadir}/applications/wicd.desktop
-%{_datadir}/autostart/wicd-tray.desktop
-%docdir %{_datadir}/doc/%{name}/
+%{_datadir}/man/man1/wicd-client.1*
+%{_datadir}/man/man5/wicd-manager-settings.conf.5*
+%{_datadir}/man/man5/wicd-wired-settings.conf.5*
+%{_datadir}/man/man5/wicd-wireless-settings.conf.5*
+%{_datadir}/man/man8/wicd-cli.8*
+%{_datadir}/man/man8/wicd.8*
 %{_mandir}/nl/man?/%{name}*
-%{_mandir}/man?/%{name}*
+%{_datadir}/pixmaps/wicd*
+%dir %{_datadir}/wicd
+%dir %{_datadir}/wicd/backends
+%dir %{_datadir}/wicd/cli
+%dir %{_datadir}/wicd/daemon
+%{_datadir}/wicd/backends/*
+%{_datadir}/wicd/cli/*
+%{_datadir}/wicd/daemon/*
 %{_sysconfdir}/%{name}
 %{_sysconfdir}/acpi/resume.d/80-wicd-connect.sh
 %{_sysconfdir}/acpi/suspend.d/50-wicd-suspend.sh
@@ -130,11 +219,35 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sysconfdir}/rc.d/init.d/wicd
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 %{_sbindir}/wicd
-%{_libdir}/pm-utils/sleep.d/91wicd
-%{_localstatedir}/log/wicd/.empty_on_purpose
 %{_localstatedir}/lib/wicd
 
+%files curses
+%defattr(-,root,root,-)
+%dir %{_datadir}/wicd/curses
+%{_datadir}/wicd/curses/*
+%{_bindir}/wicd-curses
+%{_datadir}/man/man8/wicd-curses.8*
+%lang(nl) %{_datadir}/man/nl/man8/wicd-curses.8*
+
+%files gtk
+%defattr(-,root,root,-)
+%dir %{_datadir}/wicd/gtk
+%dir %{_datadir}/pixmaps/wicd
+%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
+%{_datadir}/wicd/gtk/*
+%{_datadir}/pixmaps/wicd/*
+%{_datadir}/pixmaps/wicd-gtk.xpm
+%{_bindir}/wicd-gtk
+%{_datadir}/icons/hicolor/*/apps/wicd-gtk.png
+%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
+
 %changelog
+* Sun May 22 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.7.0-6
+- changed BuildArch to noarch
+- updated spec
+- splitted -common, -curses, -gtk packages
+- Added Patch4,5,6,7,8 from Debian
+
 * Wed Jun 9 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.7.0-5
 - improved service start process in %%post section
 - changed daemon start runlevel