From 60f90c4d4d837174344cc0634b8f91878e48bdcde971cef7e17e5c953024b140 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Dec 2011 12:57:57 +0000 Subject: [PATCH] updated to 67031 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-transfer?expand=0&rev=12 --- yast2-transfer-2.21.0.tar.bz2 | 4 ++-- yast2-transfer.changes | 5 +++++ yast2-transfer.spec | 39 +++++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/yast2-transfer-2.21.0.tar.bz2 b/yast2-transfer-2.21.0.tar.bz2 index 6f8e8f6..19be426 100644 --- a/yast2-transfer-2.21.0.tar.bz2 +++ b/yast2-transfer-2.21.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c2b0a3723956fd3259d78e91c330e9740bcf5837995692532a7fbc25c60d637 -size 276935 +oid sha256:489d731ff61cf9c5ee2cebccaab9d50e4ca6b97b5bc96001ee05851305af7d6a +size 288987 diff --git a/yast2-transfer.changes b/yast2-transfer.changes index ed24872..f0e9d52 100644 --- a/yast2-transfer.changes +++ b/yast2-transfer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 25 12:26:08 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Fri Jul 29 14:16:32 CEST 2011 - ug@suse.de diff --git a/yast2-transfer.spec b/yast2-transfer.spec index 632b86c..a881ce9 100644 --- a/yast2-transfer.spec +++ b/yast2-transfer.spec @@ -15,22 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-transfer Version: 2.21.0 -Release: 1 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-transfer-2.21.0.tar.bz2 +Source0: yast2-transfer-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ -BuildRequires: curl-devel doxygen gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: curl-devel +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: libxcrypt-devel +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite Summary: YaST2 - Agent for Various Transfer Protocols +License: GPL-2.0+ +Group: System/YaST Provides: yast2-agent-curl yast2-agent-tftp yast2-agent-curl-devel yast2-agent-tftp-devel Obsoletes: yast2-agent-curl yast2-agent-tftp yast2-agent-curl-devel yast2-agent-tftp-devel Requires: curl @@ -39,26 +45,26 @@ Requires: curl A YaST2 Agent for various Transfer Protocols: FTP, HTTP, and TFTP. %prep -%setup -n yast2-transfer-2.21.0 +%setup -n yast2-transfer-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -82,5 +88,6 @@ rm -rf "$RPM_BUILD_ROOT" #%dir /usr/share/YaST2/include/transfer #/usr/share/YaST2/include/transfer/url.ycp -%doc %{prefix}/share/doc/packages/yast2-transfer +%doc %{_prefix}/share/doc/packages/yast2-transfer + %changelog