Changes - j0ke.net Open Build Service

[-] [+]	Changed	flow-tools.spec
@@ -20,7 +20,7 @@ Patch4: flow-tools-0.68.python.patch Patch5: %{name}-declares.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: glibc-devel libgcc gcc gcc-c++ flex mysql-devel postgresql-devel python-devel tar openssl-devel +BuildRequires: glibc-devel libgcc gcc gcc-c++ flex mysql-devel postgresql-devel python-devel tar openssl-devel bzip2 %if 0%{?suse_version} BuildRequires: mysql-client @@ -78,9 +78,9 @@ --localstatedir=%{_sysconfdir}/flow-tools \ --with-openssl=%{_libdir} %__make - # build Cflow perl module -cd $RPM_BUILD_DIR/%{cflowname}-%{cflowver} +tar -C contrib -jxf %{S:2} +cd contrib/%{cflowname}-%{cflowver} perl Makefile.PL PREFIX=%{_prefix} INSTALLDIRS=vendor %install @@ -88,8 +88,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates make install DESTDIR=$RPM_BUILD_ROOT -cd $RPM_BUILD_DIR/%{cflowname}-%{cflowver} + +# install Cflow perl module +cd contrib/%{cflowname}-%{cflowver} make install DESTDIR=$RPM_BUILD_ROOT + install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/flow-tools ln -sf ../../etc/init.d/flow-tools $RPM_BUILD_ROOT/%{_sbindir}/rcflow-tools install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}/var/adm/fillup-templates