Browse Source

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

kudoh 12 years ago
parent
commit
f9582c8b61
1 changed files with 20 additions and 6 deletions
  1. 20 6
      w/wicd/wicd-vl.spec

+ 20 - 6
w/wicd/wicd-vl.spec

@@ -3,18 +3,19 @@
 Summary: A wireless and wired network manager
 Summary(ja): 無線・有線ネットワークマネージャ
 Name: wicd
-Version: 1.7.1
+Version: 1.7.2.4
 Release: 1%{?_dist_release}
 Source0: %{name}-%{version}.tar.gz
 Patch0:  wicd-desktop.patch
 Patch1:  02-workaround_dhclient_bug.patch
-Patch2:  26-support_etc-network_scripts.patch
+#Patch2:  26-support_etc-network_scripts.patch
+Patch3: 770_769.diff
 Patch100: add_fix_ja.patch
 
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-URL: http://wicd.net
+URL: https://launchpad.net/wicd
 BuildArch: noarch
 
 BuildRequires: gettext
@@ -25,6 +26,10 @@ BuildRequires: python-setuptools
 
 Requires: pm-utils >= 1.2.4
 
+Requires: %{name}-common
+Requires: %{name}-curses
+Requires: %{name}-gtk
+
 #Requires(post):   chkconfig
 #Requires(preun):  chkconfig
 #Requires(preun):  /sbin/service
@@ -96,15 +101,14 @@ Client program for wicd that uses a GTK+ interface.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+%patch3 -p0
 %patch100 -p1
 
 %{__sed} -i 's/\r//' wicd/logfile.py
 
 %build
 python setup.py compile_translations
-# python-babel currently doesn't support Asturian, using gettext
-msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
 
 %{__python} setup.py configure --share=%{_datadir}/%{name} \
        --etc=%{_sysconfdir}/%{name} \
@@ -121,6 +125,8 @@ msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
        --no-install-docs
 
 python setup.py build
+# python-babel currently doesn't support Asturian, using gettext
+msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
 
 %install
 rm -rf %{buildroot}
@@ -237,6 +243,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Sat May 05 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.7.2.4-1
+- new upstream release
+- dropt patch2
+- added Patch3 from upstream
+- fixed patch100
+- added Requires: %%{name}-common, %%{name}-curses %%{name}-gtk in wicd
+- changed URL: https://launchpad.net/wicd
+
 * Sat Feb 18 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.7.1-1
 - dropt almost pathces
   - enabled patch is wicd-desktop.patch (Patch0)