Browse Source

2015-02-05 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* wicd, wpa_supplicant: updated
	* xfce4-dict: fixed spec file
	* xfcet-settings: added patch
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9331 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 7 years ago
parent
commit
04b18d5d60

+ 41 - 31
w/wicd/wicd-vl.spec

@@ -3,26 +3,31 @@
 Summary: A wireless and wired network manager
 Summary(ja): 無線・有線ネットワークマネージャ
 Name: wicd
-Version: 1.7.2.4
-Release: 2%{?_dist_release}
-Source0: %{name}-%{version}.tar.gz
-Patch0:  wicd-desktop.patch
-Patch1:  02-workaround_dhclient_bug.patch
-#Patch2:  26-support_etc-network_scripts.patch
-Patch3: 770_769.diff
-Patch100: add_fix_ja.patch
+Version: 1.7.3
+Release: 1%{?_dist_release}
 
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: https://launchpad.net/wicd
-BuildArch: noarch
 
+Source0: %{name}-%{version}.tar.gz
+Patch0:  wicd-desktop.patch
+Patch1:  wicd-1.7.3-workaround_dhclient_bug.patch
+
+# Vine Patch
+Patch100: add_fix_ja.patch
+Patch101: wicd-1.7.3-setup.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
-BuildRequires: python >= 2.4 python-devel >= 2.4
+BuildRequires: python >= 2.4
+BuildRequires: python-devel >= 2.4
 BuildRequires: python-babel
 BuildRequires: python-setuptools
+BuildRequires: pm-utils
 
 Requires: pm-utils >= 1.2.4
 
@@ -58,7 +63,7 @@ Requires: ethtool
 Requires: iproute
 Requires: logrotate
 Requires: net-tools
-Requires: pm-utils
+Requires: pm-utils-devel
 Requires: wireless-tools
 Requires: wpa_supplicant
 
@@ -86,7 +91,7 @@ Client program for wicd that uses a curses interface.
 %package gtk
 Summary: GTK+ client for Wicd
 Summary(ja): Wicd の GTK+ クライアント
-Group: Applications/Internet
+Group: Applications/System
 BuildArch: noarch
 Requires: %{name}-common = %{version}-%{release}
 Requires: pygtk2 >= 2.10
@@ -101,16 +106,15 @@ Client program for wicd that uses a GTK+ interface.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
-%patch3 -p0
-%patch100 -p1
+%patch101 -p1
 
 %{__sed} -i 's/\r//' wicd/logfile.py
 
 %build
 python setup.py compile_translations
 
-%{__python} setup.py configure --share=%{_datadir}/%{name} \
+%{__python} setup.py configure \
+       --share=%{_datadir}/%{name} \
        --etc=%{_sysconfdir}/%{name} \
        --bin=%{_bindir} \
        --sbin=%{_sbindir} \
@@ -120,30 +124,31 @@ python setup.py compile_translations
        --resume=%{_sysconfdir}/acpi/resume.d \
        --suspend=%{_sysconfdir}/acpi/suspend.d \
        --docdir=%{_docdir}/%{name}-%{version} \
-       --log %{_localstatedir}/log \
+       --log=%{_localstatedir}/log \
+       --no-install-gnome-shell-extensions \
        --no-install-kde \
        --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
+# msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
 
 %install
-rm -rf %{buildroot}
-python setup.py install -O1 --skip-build --root=%{buildroot}
-install -D init/redhat/%{name} %{buildroot}%{_initddir}/%{name}
+[ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+install -D init/redhat/%{name} $RPM_BUILD_ROOT%{_initddir}/%{name}
 
-find %{buildroot} -type f -name ".empty_on_purpose" | xargs rm
+find $RPM_BUILD_ROOT -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
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/wicd.desktop
 
 desktop-file-install \
-    --dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
-    %{buildroot}%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
+    --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+    $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 
 %find_lang %{name}
 
@@ -202,7 +207,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/man/man5/wicd-wireless-settings.conf.5*
 %{_datadir}/man/man8/wicd-cli.8*
 %{_datadir}/man/man8/wicd.8*
-%{_datadir}/pixmaps/wicd*
+#{_datadir}/pixmaps/wicd*
 %dir %{_datadir}/wicd
 %dir %{_datadir}/wicd/backends
 %dir %{_datadir}/wicd/cli
@@ -233,16 +238,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files gtk
 %defattr(-,root,root,-)
 %dir %{_datadir}/wicd/gtk
-%dir %{_datadir}/pixmaps/wicd
+%dir %{_datadir}/wicd/icons
 %{_sysconfdir}/xdg/autostart/wicd-tray.desktop
 %{_datadir}/wicd/gtk/*
-%{_datadir}/pixmaps/wicd/*
+%{_datadir}/wicd/icons/*
 %{_datadir}/pixmaps/wicd-gtk.xpm
 %{_bindir}/wicd-gtk
-%{_datadir}/icons/hicolor/*/apps/wicd-gtk.png
-%{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
+%{_datadir}/icons/hicolor/*/*/*
 
 %changelog
+* Thu Feb  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.7.3-1
+- new upstream release
+- updated Patch0 and 1
+- dropt Patch3 and 100
+- added Patch101
+
 * Sat Aug 30 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.7.2.4-2
 - rebuilt with current environment
 

+ 62 - 29
w/wpa_supplicant/wpa_supplicant-vl.spec

@@ -1,7 +1,9 @@
+%define build_gui 1
+
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
-Version: 0.7.3
-Release: 3%{?_dist_release}
+Version: 2.3
+Release: 1%{?_dist_release}
 License: BSD
 Group: System Environment/Base
 URL: http://w1.fi/wpa_supplicant/
@@ -13,7 +15,6 @@ Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source6: %{name}.logrotate
 
-# import from Fedora package
 # distro specific customization and not suitable for upstream,
 # works around busted drivers
 Patch0: wpa_supplicant-assoc-timeout.patch
@@ -24,26 +25,31 @@ Patch1: wpa_supplicant-flush-debug-output.patch
 Patch2: wpa_supplicant-dbus-service-file-args.patch
 # quiet an annoying and frequent syslog message
 Patch3: wpa_supplicant-quiet-scan-results-message.patch
-# recover from streams of driver disconnect messages (iwl3945)
-Patch4: wpa_supplicant-squelch-driver-disconnect-spam.patch
 # allow more private key encryption algorithms
 Patch5: wpa_supplicant-openssl-more-algs.patch
-# Send PropertyChanged notificationes when the BSS list changes
-Patch7: wpa_supplicant-bss-changed-prop-notify.patch
-# Don't crash trying to pass NULL to dbus
-Patch8: 0001-dbus-clean-up-new-D-Bus-interface-getters-setters.patch
+# distro specific customization for Qt4 build tools, not suitable for upstream
+Patch6: wpa_supplicant-gui-qt4.patch
+# Fix libnl3 includes path
+Patch7: libnl3-includes.patch
+# Less aggressive roaming; signal strength is wildly variable
+Patch8: rh837402-less-aggressive-roaming.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+## Vine patches
+Patch700: wpa_supplicant-2.3-vineqt4.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+%if %{build_gui}
 BuildRequires: qt4-devel
-BuildRequires: qt4-designer
+%endif
 BuildRequires: openssl-devel
 BuildRequires: readline-devel
 BuildRequires: dbus-devel
-BuildRequires: libnl-devel
+BuildRequires: libnl3-devel
+BuildRequires: docbook-utils
 
-Requires(post): chkconfig
-Requires(preun): chkconfig
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig /sbin/service
+Requires(postun): /sbin/service
 
 %description
 wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support 
@@ -52,9 +58,10 @@ component that is used in the client stations. It implements key negotiation
 with a WPA Authenticator and it controls the roaming and IEEE 802.11 
 authentication/association of the wlan driver.
 
+%if %{build_gui}
 %package gui
 Summary: Graphical User Interface for %{name}
-Summary(ja): wpa_supplicant のグラフィカルユーザインタフェース
+Summary(ja): %{name} のグラフィカルユーザインタフェース
 Group: Applications/System
 
 %description gui
@@ -62,6 +69,7 @@ Graphical User Interface for wpa_supplicant written using QT4
 
 %description -l ja gui
 QT4 を用いた wpa_supplicant のグラフィカルユーザインタフェース
+%endif
 
 %prep
 %setup -q
@@ -69,18 +77,29 @@ QT4 を用いた wpa_supplicant のグラフィカルユーザインタフェー
 %patch1 -p1 -b .flush-debug-output
 %patch2 -p1 -b .dbus-service-file
 %patch3 -p1 -b .quiet-scan-results-msg
-%patch4 -p1 -b .disconnect-spam
 %patch5 -p1 -b .more-openssl-algs
-%patch7 -p1 -b .bss-changed-prop-notify
-%patch8 -p1 -b .dbus-rework
+%patch6 -p1 -b .qt4
+%patch7 -p1 -b .libnl3
+%patch8 -p1 -b .rh837402-less-aggressive-roaming
+
+%patch700 -p1 -b .qt4
 
 %build
 pushd wpa_supplicant
-  cp %{SOURCE1} ./.config
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
-  make %{_smp_mflags}
-  PATH=$PATH:%{_libdir}/qt4/bin QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags}
+  cp %{SOURCE1} .config
+  echo "CONFIG_LIBNL32=y" >> .config
+
+  CFLAGS="${CFLAGS:-%optflags} -fPIE -DPIE" ; export CFLAGS ;
+  CXXFLAGS="${CXXFLAGS:-%optflags} -fPIE -DPIE" ; export CXXFLAGS ;
+  LDFLAGS="${LDFLAGS:-%optflags} -pie -Wl,-z,now" ; export LDFLAGS ;
+  # yes, BINDIR=_sbindir
+  BINDIR="%{_sbindir}" ; export BINDIR ;
+  LIBDIR="%{_libdir}" ; export LIBDIR ;
+  make %{?_smp_mflags}
+%if %{build_gui}
+  QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{?_smp_mflags}
+%endif
+  make eapol_test
 popd
 
 %install
@@ -103,9 +122,11 @@ install -D -m 0644 %{name}/dbus/dbus-wpa_supplicant.conf %{buildroot}/%{_sysconf
 install -D -m 0644 %{name}/dbus/fi.w1.wpa_supplicant1.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 install -D -m 0644 %{name}/dbus/fi.epitest.hostap.WPASupplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 
+%if %{build_gui}
 # gui
 install -d %{buildroot}/%{_bindir}
 install -m 0755 %{name}/wpa_gui-qt4/wpa_gui %{buildroot}/%{_bindir}
+%endif
 
 # running
 mkdir -p %{buildroot}/%{_localstatedir}/run/%{name}
@@ -118,23 +139,27 @@ install -m 0644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5
 # some cleanup in docs
 rm -f  %{name}/doc/.cvsignore
 rm -rf %{name}/doc/docbook
-
+chmod -R 0644 %{name}/examples/*.py
 
 %clean
 rm -rf %{buildroot}
 
 %post
 if [ $1 = 1 ]; then
-	chkconfig --add %{name}
+    /sbin/chkconfig --add %{name}
 fi
 
 %preun
 if [ $1 = 0 ]; then
-	service %{name} stop > /dev/null 2>&1
-        killall -TERM wpa_supplicant >/dev/null 2>&1
-	/sbin/chkconfig --del %{name}
+    /sbin/service %{name} stop > /dev/null 2>&1
+    killall -TERM wpa_supplicant >/dev/null 2>&1
+    /sbin/chkconfig --del %{name}
 fi
 
+%postun
+if [ $1 -ge 1 ]; then
+    /sbin/service %{name} condrestart > /dev/null 2>&1
+fi
 
 %files
 %defattr(-, root, root)
@@ -154,12 +179,20 @@ fi
 %{_mandir}/man8/*
 %{_mandir}/man5/*
 
+%if %{build_gui}
 %files gui
 %defattr(-, root, root)
 %{_bindir}/wpa_gui
+%endif
 
 %changelog
-* Mon Aug 22 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.7.3-3
+* Thu Feb  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.3-1
+- updated to 2.3
+- built with libnl3 instead of libnl
+- added Patch 6, 7 and 8 from Fedora
+- added Patch700
+
+  * Mon Aug 22 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.7.3-3
 - import Patch8 from Fedora 1:0.7.3-9 to fix some crashes
   - Wed Jul 27 2011 Dan Williams <dcbw@redhat.com> - 1:0.7.3-9
   - Fix various crashes with D-Bus interface (rh #678625) (rh #725517)

+ 7 - 15
x/xfce4-dict/xfce4-dict-vl.spec

@@ -2,20 +2,15 @@ Name:           xfce4-dict
 Summary:        Dictionary services for Xfce
 Summary(ja):    Xfce の辞書サービス
 Version:        0.7.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 License:        GPLv2+
-Group:          User Interface/Desktops
+Group:          Applications/Accessories
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 
-Source0:        http://archive.xfce.org/src/apps/%{name}/0.6/%{name}-%{version}.tar.bz2
-Source1:	xfce4-dict-autogen.sh
-
-Patch0:		xfce4-dict-0.6.0-git20120605.patch
-Patch1:		xfce4-dict-0.6.0-ui.patch
+Source0:        http://archive.xfce.org/src/apps/%{name}/0.7/%{name}-%{version}.tar.bz2
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel >= 2.20.0
 BuildRequires: libxfce4ui-devel >= 4.10.0
@@ -39,19 +34,13 @@ service by opening a web browser or search for words using a spell check
 program like aspell, ispell or enchant.
 
 
-
 %prep
 %setup -q
-#patch0 -p1 -b .git
-#patch1 -p1 -b .ui
 
 %build
-#cp %{SOURCE1} autogen.sh
-#NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -74,7 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database %{_datadir}/applications &> /dev/null || :
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -95,6 +83,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_mandir}/man1/xfce4-dict.1.gz
 
 %changelog
+* Thu Feb  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.7.0-2
+- fixed %%post script
+- moved to Applications/Accessories Group
+
 * Sun Sep 14 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.7.0-1
 - updated to 0.7.0
 

+ 10 - 5
x/xfce4-settings/xfce4-settings-vl.spec

@@ -4,7 +4,7 @@ Name:           xfce4-settings
 Summary:        Settings Manager for Xfce
 Summary(ja):    Xfce の設定マネージャー
 Version:        4.10.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 # xfce4-settings-helper is GPLv2 only. 
 License:        GPLv2+ and GPLv2
@@ -12,9 +12,10 @@ Group:          User Interface/Desktops
 URL:            http://www.xfce.org/
 
 Source0:        http://www.xfce.org/archive/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-Patch0:         xfce4-settings-4.6.4-libxklavier5.patch
 # Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6236
 Patch1: 	xfce4-settings-4.6.4-dsofix.patch
+## Downstream patches
+Patch2:          xfce4-settings-4.8.3-monitor-position.patch
 
 # use vendor's artwork
 #Patch10:        xfce4-settings-4.6.0-fedora.patch
@@ -22,11 +23,12 @@ Patch1: 	xfce4-settings-4.6.4-dsofix.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: dbus-glib-devel >= 0.84
 BuildRequires: desktop-file-utils
+BuildRequires: garcon-devel >= 0.2.0
 BuildRequires: gettext
 BuildRequires: glib2-devel >= 2.24.0
 BuildRequires: gtk2-devel >= 2.20.0
 BuildRequires: intltool
-BuildRequires: garcon-devel >= 0.2.0
+BuildRequires: libcanberra-devel
 BuildRequires: libexo-devel >= 0.8.0
 BuildRequires: libxfce4ui-devel >= 4.10.0
 BuildRequires: libxfce4util-devel >= 4.10.0
@@ -55,11 +57,11 @@ This package includes the settings manager applications for the Xfce desktop.
 
 %prep
 %setup -q
-#patch0 -p1 -b .xklavier5
 %patch1 -p1 -b .dsofix
+%patch2 -p1 -b .monitor
 
 %build
-%configure --enable-sound-settings
+%configure --enable-sound-settings --enable-pluggable-dialogs
 make %{?_smp_mflags}
 
 
@@ -104,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Thu Feb  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 4.10.1-2
+- added Patch2 from Fedora
+
 * Sun Aug 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 4.10.1-1
 - new upstream release