|
|
@@ -13,7 +13,7 @@
|
|
|
Name: NetworkManager
|
|
|
Summary: Network connection manager and user applications
|
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
|
-Version: 0.9.10.0
|
|
|
+Version: 0.9.10.2
|
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPLv2+
|
|
|
@@ -28,6 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
Requires(post): chkconfig
|
|
|
Requires(preun): chkconfig
|
|
|
+Requires(posttrans): util-linux
|
|
|
|
|
|
Requires: iproute openssl
|
|
|
Requires: dhclient
|
|
|
@@ -121,15 +122,15 @@ sed -i "s|redhat-release|vine-release|g" configure
|
|
|
%configure \
|
|
|
--enable-silent-rules \
|
|
|
--disable-static \
|
|
|
- --enable-ifcfg-rh \
|
|
|
- --with-dhclient=yes \
|
|
|
- --with-dhcpcd=no \
|
|
|
- --with-crypto=nss \
|
|
|
- --with-docs=yes \
|
|
|
- --enable-more-warnings=yes \
|
|
|
- --enable-modify-system=yes \
|
|
|
- --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
- --with-dist-version=%{version}-%{release}
|
|
|
+ --enable-ifcfg-rh \
|
|
|
+ --with-dhclient=yes \
|
|
|
+ --with-dhcpcd=no \
|
|
|
+ --with-crypto=nss \
|
|
|
+ --with-docs=yes \
|
|
|
+ --enable-more-warnings=yes \
|
|
|
+ --enable-modify-system=yes \
|
|
|
+ --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
+ --with-dist-version=%{version}-%{release}
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
@@ -141,6 +142,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
|
|
|
|
|
|
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
|
|
|
+cp -p data/server.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/00-server.conf
|
|
|
+
|
|
|
# create a VPN directory
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
|
|
|
|
|
|
@@ -183,6 +187,21 @@ fi
|
|
|
%post glib -p /sbin/ldconfig
|
|
|
%postun glib -p /sbin/ldconfig
|
|
|
|
|
|
+%posttrans
|
|
|
+for file in `ls %{_sysconfdir}/sysconfig/network-scripts/ifcfg-*`
|
|
|
+do
|
|
|
+ grep "^UUID=" $file > /dev/null 2>&1
|
|
|
+ if [ "$?" != "0" ]; then
|
|
|
+ device_name=`grep "DEVICE=" $file | awk -F'=' '{print $2;}' | grep -v lo`
|
|
|
+ if [ "$device_name" != "" ]; then
|
|
|
+ device_uuid=`uuidgen $device_name`
|
|
|
+ if [ "$device_uuid" != "" ]; then
|
|
|
+ echo "UUID=$device_uuid" >> $file
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+done
|
|
|
+
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,0755)
|
|
|
@@ -196,7 +215,9 @@ fi
|
|
|
%dir %{_sysconfdir}/%{name}/
|
|
|
%dir %{_sysconfdir}/%{name}/dispatcher.d
|
|
|
%dir %{_sysconfdir}/%{name}/VPN
|
|
|
+%dir %{_sysconfdir}/%{name}/conf.d
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
|
|
|
+%config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
|
|
|
%{_bindir}/nm-online
|
|
|
%{_bindir}/nmcli
|
|
|
%{_libexecdir}/nm-avahi-autoipd.action
|
|
|
@@ -252,6 +273,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Apr 05 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.10.2-1
|
|
|
+- new upstream release
|
|
|
+- add %%posttrans to insert UUID in ifcfg-xxx
|
|
|
+
|
|
|
* Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.9.10.0-1
|
|
|
- new upstream release
|
|
|
- change BuildRequires: eudev-libgudev1-devel instead of libgudev1-devel
|
Takemikaduchi