gnome-user-docs: change path of documents

acpid: rename event file
others: new upstream release

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

N/NetworkManager-openconnect/NetworkManager-openconnect-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.0
+%define nm_version          0.9.2.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define openconnect_version 3.02
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Summary(ja): NetworkManager の openconnect 用 VPN 統合
 Name:      NetworkManager-openconnect
-Version:   0.9.0
+Version:   0.9.2.0
 Release:   1%{svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -110,6 +110,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
 
 %changelog
+* Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
+- new upstream release
+
 * Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.0-1
 - new upstream release
 

N/NetworkManager-openvpn/NetworkManager-openvpn-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.0
+%define nm_version          0.9.2.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define openvpn_version     2.1
@@ -9,7 +9,7 @@
 Summary: NetworkManager VPN plugin for OpenVPN
 Summary(ja): OpenVPN を使った NetworkManager 用 VPN プラグイン
 Name: NetworkManager-openvpn
-Version: 0.9.0
+Version: 0.9.2.0
 Release: 1%{?svn_snapshot}%{?_dist_release}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -115,6 +115,9 @@ fi
 
 
 %changelog
+* Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
+- new upstream release
+
 * Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.0-1
 - new upstream release
 

N/NetworkManager-pptp/NetworkManager-pptp-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.0
+%define nm_version          0.9.2.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define ppp_version         2.4.5
@@ -8,7 +8,7 @@
 
 Summary:   NetworkManager VPN plugin for pptp
 Name:      NetworkManager-pptp
-Version:   0.9.0
+Version:   0.9.2.0
 Release:   1%{?svn_snapshot}%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -111,6 +111,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/pptp
 
 %changelog
+* Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
+- new upstream release
+
 * Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.0-1
 - new upstream release
 - remove Patch0

N/NetworkManager-vpnc/NetworkManager-vpnc-vl.spec

@@ -1,4 +1,4 @@
-%define nm_version          0.9.0
+%define nm_version          0.9.2.0
 %define dbus_version        1.4.14
 %define gtk3_version        3.0.0
 %define vpnc_version        0.4
@@ -9,7 +9,7 @@
 Summary:   NetworkManager VPN plugin for vpnc
 Summary(ja): NetworkManager の vpnc 用 VPN プラグイン
 Name:      NetworkManager-vpnc
-Version:   0.9.0
+Version:   0.9.2.0
 Release:   1%{?_dist_release}
 License:   GPLv2+
 Group:     System Environment/Base
@@ -98,6 +98,9 @@ fi
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 
 %changelog
+* Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.2.0-1
+- new upstream release
+
 * Tue Aug 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.0-1
 - new upstream release
 

a/acpid/acpid-vl.spec

@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Summary(ja): ACPI イベントデーモン
 Name: acpid
-Version: 2.0.8
+Version: 2.0.13
 Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
@@ -54,8 +54,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
 chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events
 
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events/video.conf
-install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events/power.conf
+install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events/video
+install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events/power
 install -m 755 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/actions/power.sh
 
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/acpid
@@ -97,8 +97,8 @@ fi
 %dir %{_sysconfdir}/acpi
 %dir %{_sysconfdir}/acpi/events
 %dir %{_sysconfdir}/acpi/actions
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/video.conf
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/power.conf
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/video
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/power
 %config(noreplace) %attr(0755,root,root) %{_sysconfdir}/acpi/actions/power.sh
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/acpid
 %{_bindir}/acpi_listen
@@ -109,6 +109,10 @@ fi
 
 
 %changelog
+* Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.13-1
+- new upstream release
+- change filename in /etc/acpi/events
+
 * Sun Apr 17 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.0.8-1
 - new upstream release
 - add acpid.sysconfig

g/gnome-user-docs/gnome-user-docs-vl.spec

@@ -2,7 +2,7 @@ Summary:        GNOME User Documentation
 Summary(ja):    GNOME ユーザドキュメント
 Name:           gnome-user-docs
 Version:        3.2.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 License:        FDL
 Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.2/%{name}-%{version}.tar.xz
 Group:          Applications/Documentation
@@ -14,6 +14,7 @@ BuildRequires:  gettext, pkgconfig
 BuildRequires:  docbook-dtds
 BuildRequires:  which
 BuildRequires:  itstool
+BuildRequires:  yelp-tools
 Obsoletes:      gnome-users-guide
 Requires(post,postun): scrollkeeper >= 0.3.10
 
@@ -46,7 +47,8 @@ desktop environment. (except for English)
 %setup -q
 
 %build
-%configure --with-help-dir=%{_datadir}/gnome/help
+autoreconf -if
+%configure 
 %__make %{?_smp_mflags}
 
 %install
@@ -75,17 +77,21 @@ exit 0
 
 %files
 %defattr(-, root, root)
-%{_datadir}/gnome/help/C
-#%{_datadir}/gnome/help/ja
+%{_datadir}/help/C
+#%{_datadir}/help/ja
 
 %files l10n
 %defattr(-, root, root)
-%{_datadir}/gnome/help/*
-%exclude %{_datadir}/gnome/help/C
-#%exclude %{_datadir}/gnome/help/ja
+%{_datadir}/help/*
+%exclude %{_datadir}/help/C
+#%exclude %{_datadir}/help/ja
 
 
 %changelog
+* Wed Nov 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.2-2
+- add BuildRequires: yelp-tools
+- change path of documents
+
 * Sun Nov 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.2-1
 - new upstream release