From bfe6da2ce4febce65a01b6b595a40eb5c5fab93c726b7d2e82111a5eb9b167c8 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Tue, 8 Oct 2013 12:39:15 +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-ldap?expand=0&rev=139
---
 yast2-ldap-3.0.1.tar.bz2 |  3 ---
 yast2-ldap-3.1.0.tar.bz2 |  3 +++
 yast2-ldap.changes       |  7 +++++++
 yast2-ldap.spec          | 42 ++++++++++++----------------------------
 4 files changed, 22 insertions(+), 33 deletions(-)
 delete mode 100644 yast2-ldap-3.0.1.tar.bz2
 create mode 100644 yast2-ldap-3.1.0.tar.bz2

diff --git a/yast2-ldap-3.0.1.tar.bz2 b/yast2-ldap-3.0.1.tar.bz2
deleted file mode 100644
index c2ad66c..0000000
--- a/yast2-ldap-3.0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab8839337ee58f5b119c365ea5c3a2362a95c905b6fd7336953d9c664798f2e2
-size 295595
diff --git a/yast2-ldap-3.1.0.tar.bz2 b/yast2-ldap-3.1.0.tar.bz2
new file mode 100644
index 0000000..860125b
--- /dev/null
+++ b/yast2-ldap-3.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ed0cda5f41f73641da7493df8252480ad53be4832a589121e949b02857105fb
+size 22798
diff --git a/yast2-ldap.changes b/yast2-ldap.changes
index 1f8f64c..15068be 100644
--- a/yast2-ldap.changes
+++ b/yast2-ldap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 19 06:52:05 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Tue Aug 13 11:10:07 UTC 2013 - lslezak@suse.cz
 
diff --git a/yast2-ldap.spec b/yast2-ldap.spec
index 78d720e..da5c30c 100644
--- a/yast2-ldap.spec
+++ b/yast2-ldap.spec
@@ -17,11 +17,11 @@
 
 
 Name:           yast2-ldap
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ldap-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -29,7 +29,7 @@ BuildRequires:  libldapcpp-devel
 BuildRequires:  libtool
 BuildRequires:  yast2
 BuildRequires:  yast2-core-devel
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 Summary:        YaST2 - LDAP Agent
 License:        GPL-2.0
 Group:          System/YaST
@@ -42,39 +42,21 @@ enables searching the LDAP tree and adding/deleting/modifying items on
 an LDAP server.
 
 %prep
-%setup -n yast2-ldap-%{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/modules/*
-/usr/share/YaST2/scrconf/*.scr
-%{_libdir}/YaST2/plugin/libpy2ag_ldap.so.*
-%{_libdir}/YaST2/plugin/libpy2ag_ldap.so
-%{_libdir}/YaST2/plugin/libpy2ag_ldap.la
-%doc %{_prefix}/share/doc/packages/yast2-ldap
+%{yast_moduledir}/*
+%{yast_scrconfdir}/*.scr
+%{yast_plugindir}/libpy2ag_ldap.so.*
+%{yast_plugindir}/libpy2ag_ldap.so
+%{yast_plugindir}/libpy2ag_ldap.la
+%doc %{yast_docdir}
 
 %changelog