From 065230180f2b770c6acb1292c529998f5b5613c79f7070edcbf5bc85f3116e42 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Wed, 9 Oct 2013 07:23:01 +0000
Subject: [PATCH] - do not use *.spec.in template, use *.spec file with RPM
 macros   instead - 3.1.0

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-users?expand=0&rev=435
---
 yast2-users-3.0.1.tar.bz2 |  3 --
 yast2-users-3.1.0.tar.bz2 |  3 ++
 yast2-users.changes       |  7 ++++
 yast2-users.spec          | 74 +++++++++++++++------------------------
 4 files changed, 38 insertions(+), 49 deletions(-)
 delete mode 100644 yast2-users-3.0.1.tar.bz2
 create mode 100644 yast2-users-3.1.0.tar.bz2

diff --git a/yast2-users-3.0.1.tar.bz2 b/yast2-users-3.0.1.tar.bz2
deleted file mode 100644
index 3d2be2d..0000000
--- a/yast2-users-3.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f746fc1a978c63b6914ac8f3c3067c61999c66f693b7fdfd111a8a79bd1af1ba
-size 426556
diff --git a/yast2-users-3.1.0.tar.bz2 b/yast2-users-3.1.0.tar.bz2
new file mode 100644
index 0000000..6b3a83a
--- /dev/null
+++ b/yast2-users-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77bfbbfe12799f57d6969e98e06a0ce4f3f64da81e8187aa2db72f599b27d05c
+size 257066
diff --git a/yast2-users.changes b/yast2-users.changes
index 178dbd4..4fd27b4 100644
--- a/yast2-users.changes
+++ b/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 17:45:35 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Wed Aug  7 12:23:46 CEST 2013 - jsuchome@suse.cz
 
diff --git a/yast2-users.spec b/yast2-users.spec
index 446285b..301a00a 100644
--- a/yast2-users.spec
+++ b/yast2-users.spec
@@ -17,11 +17,11 @@
 
 
 Name:           yast2-users
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-users-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  cracklib-devel
 BuildRequires:  doxygen
@@ -32,7 +32,7 @@ BuildRequires:  perl-XML-Writer
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2
 BuildRequires:  yast2-core-devel
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 BuildRequires:  yast2-ldap-client
 BuildRequires:  yast2-perl-bindings
 BuildRequires:  yast2-security
@@ -88,58 +88,40 @@ This package contains development documentation for using the API
 provided by yast2-users package.
 
 %prep
-%setup -n yast2-users-%{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)
-%dir /usr/share/YaST2/include/users
-%dir /usr/share/YaST2/modules/YaPI
-/usr/share/YaST2/clients/*.rb
-%{_prefix}/share/applications/YaST2/*.desktop
-/usr/share/YaST2/modules/*.pm
-/usr/share/YaST2/modules/UsersUI.rb
-/usr/share/YaST2/modules/YaPI/*.pm
-/usr/share/YaST2/include/users/*
-/usr/share/YaST2/schema/autoyast/rnc/users.rnc
+%dir %{yast_yncludedir}/users
+%dir %{yast_moduledir}/YaPI
+%{yast_clientdir}/*.rb
+%{yast_desktopdir}/*.desktop
+%{yast_moduledir}/*.pm
+%{yast_moduledir}/UsersUI.rb
+%{yast_moduledir}/YaPI/*.pm
+%{yast_yncludedir}/users/*
+%{yast_schemadir}/autoyast/rnc/users.rnc
 #agents:
-/usr/share/YaST2/scrconf/*.scr
-/usr/lib/YaST2/servers_non_y2/ag_nis
-/usr/lib/YaST2/servers_non_y2/ag_uid
-%{_libdir}/YaST2/plugin/libpy2ag_crack.so.*
-%{_libdir}/YaST2/plugin/libpy2ag_crack.so
-%{_libdir}/YaST2/plugin/libpy2ag_crack.la
-%dir %{_prefix}/share/doc/packages/yast2-users
-%doc %{_prefix}/share/doc/packages/yast2-users/README
-%doc %{_prefix}/share/doc/packages/yast2-users/COPYING
-%doc %{_prefix}/share/doc/packages/yast2-users/TODO.txt
-%doc %{_prefix}/share/doc/packages/yast2-users/users.html
+%{yast_scrconfdir}/*.scr
+%{yast_agentdir}/ag_nis
+%{yast_agentdir}/ag_uid
+%{yast_plugindir}/libpy2ag_crack.so.*
+%{yast_plugindir}/libpy2ag_crack.so
+%{yast_plugindir}/libpy2ag_crack.la
+%dir %{yast_docdir}
+%doc %{yast_docdir}/README
+%doc %{yast_docdir}/COPYING
+%doc %{yast_docdir}/TODO.txt
+%doc %{yast_docdir}/users.html
 
 %files devel-doc
-%doc %{_prefix}/share/doc/packages/yast2-users/autodocs
-%doc %{_prefix}/share/doc/packages/yast2-users/crack.html
+%doc %{yast_docdir}/autodocs
+%doc %{yast_docdir}/crack.html
 
 %changelog