From 430d5850c68b859e7410d33b773263b373cf54e1 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 19 Apr 2012 08:58:18 +0000 Subject: [PATCH] - merged 0.4.5.4 from PLD --- rc-scripts.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/rc-scripts.spec b/rc-scripts.spec index e346f09..91f9906 100644 --- a/rc-scripts.spec +++ b/rc-scripts.spec @@ -7,20 +7,18 @@ Summary(fr.UTF-8): inittab et scripts /etc/rc.d Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts -Version: 0.4.5.3 -Release: 9 +Version: 0.4.5.4 +Release: 2 License: GPL v2 Group: Base #Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz -# Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e +# Source0-md5: e073e75ca6220e463bd659d25feefde6 Source1: rc-local.service Source2: sys-chroots.service Source3: %{name}.tmpfiles -URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts -Patch0: %{name}-skip_networkmanager_users_config.patch -Patch1: %{name}-svn.patch Patch100: %{name}-tld.patch +URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel @@ -111,13 +109,11 @@ programcıklar içerir. %prep %setup -q -%patch0 -p1 -%patch1 -p0 %patch100 -p1 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch: #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic" -sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' configure.ac +sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt -lpthread"#' configure.ac %build %{__aclocal} @@ -132,7 +128,7 @@ sed -i -e 's#^GLIB_LIBS=.*#GLIB_LIBS="%{_prefix}/%{_lib}/libglib-2.0.a -lrt"#' c %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/var/{run/netreport,log} \ - $RPM_BUILD_ROOT/etc/sysconfig/hwprofiles \ + $RPM_BUILD_ROOT/etc/sysconfig/{interfaces/data,hwprofiles} \ $RPM_BUILD_ROOT{%{systemdtmpfilesdir},%{systemdunitdir}} %{__make} install \ -- 2.37.3