From 53cc00704b8d028db95be9db1ae24120d7a3f3d6177c5c6cf6a4d190ad301141 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Wed, 16 Oct 2013 08:55:58 +0000
Subject: [PATCH] Updated to git ref b5973da

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-proxy?expand=0&rev=111
---
 yast2-proxy-3.0.0.tar.bz2 |  3 ---
 yast2-proxy-3.1.0.tar.bz2 |  3 +++
 yast2-proxy.changes       |  7 ++++++
 yast2-proxy.spec          | 47 ++++++++++++---------------------------
 4 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 yast2-proxy-3.0.0.tar.bz2
 create mode 100644 yast2-proxy-3.1.0.tar.bz2

diff --git a/yast2-proxy-3.0.0.tar.bz2 b/yast2-proxy-3.0.0.tar.bz2
deleted file mode 100644
index 6f63e89..0000000
--- a/yast2-proxy-3.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ee07a5f4da9bca203a657e38dabd74e2ab80d1c27e889828fe7cdd88de508a6
-size 97515
diff --git a/yast2-proxy-3.1.0.tar.bz2 b/yast2-proxy-3.1.0.tar.bz2
new file mode 100644
index 0000000..19ddf94
--- /dev/null
+++ b/yast2-proxy-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1efc32566ef050119c93bdc85c0bb090aeb19a3538547a346cfe92203d8f3120
+size 24467
diff --git a/yast2-proxy.changes b/yast2-proxy.changes
index 2c74e2f..dafe80b 100644
--- a/yast2-proxy.changes
+++ b/yast2-proxy.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 15:04:31 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Jul 31 08:38:05 UTC 2013 - yast-devel@opensuse.org
 
diff --git a/yast2-proxy.spec b/yast2-proxy.spec
index 58b627b..31e5a22 100644
--- a/yast2-proxy.spec
+++ b/yast2-proxy.spec
@@ -17,18 +17,18 @@
 
 
 Name:           yast2-proxy
-Version:        3.0.0
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-proxy-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 # should be required by devtools
 BuildRequires:  perl-XML-Writer
 BuildRequires:  pkgconfig
 BuildRequires:  rpm
 BuildRequires:  update-desktop-files
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-testsuite
 
 BuildRequires:  yast2
@@ -51,43 +51,24 @@ Url:            http://en.opensuse.org/Portal:YaST
 This package contains the YaST2 component for proxy configuration.
 
 %prep
-%setup -n yast2-proxy-%{version}
+%setup -n %{name}-%{version}
 
 %build
-%{_prefix}/bin/y2tool y2autoconf
-%{_prefix}/bin/y2tool y2automake
-autoreconf --force --install
-
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-
-./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
+%yast_build
 
 %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
-    d=${f##*/}
-    %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%yast_install
 
 %files
 %defattr(-,root,root)
-/usr/share/YaST2/clients/*.rb
-/usr/share/YaST2/modules/*.rb
-/usr/share/YaST2/include/proxy
-%{_prefix}/share/applications/YaST2/*.desktop
-/usr/share/YaST2/scrconf/*.scr
-/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
+%{yast_clientdir}/*.rb
+%{yast_moduledir}/*.rb
+%{yast_yncludedir}/proxy
+%{yast_desktopdir}/*.desktop
+%{yast_scrconfdir}/*.scr
+%{yast_schemadir}/autoyast/rnc/proxy.rnc
 
-%dir %{_prefix}/share/doc/packages/yast2-proxy
-%{_prefix}/share/doc/packages/yast2-proxy/COPYING
-%readme %{_prefix}/share/doc/packages/yast2-proxy/README
+%dir %{yast_docdir}
+%{yast_docdir}/COPYING
 
 %changelog