diff --git a/yast2-ldap-2.21.1.tar.bz2 b/yast2-ldap-2.21.1.tar.bz2 index dfd49c5..dc689f2 100644 --- a/yast2-ldap-2.21.1.tar.bz2 +++ b/yast2-ldap-2.21.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50c6017e9dcf86aa8366b2fdc7a8debc57672392224ed6beddc41ef27798e4e8 -size 268851 +oid sha256:27a872b5bfe883cafdaeb8ea8b1ac771c62877af8c3f1ec68c17a3dcc8768a90 +size 269897 diff --git a/yast2-ldap.changes b/yast2-ldap.changes index b62fa8e..78c8943 100644 --- a/yast2-ldap.changes +++ b/yast2-ldap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 25 12:21:42 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Wed Aug 31 15:42:11 CEST 2011 - jsuchome@suse.cz diff --git a/yast2-ldap.spec b/yast2-ldap.spec index 91ddbbd..ba3250f 100644 --- a/yast2-ldap.spec +++ b/yast2-ldap.spec @@ -15,22 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: yast2-ldap Version: 2.21.1 -Release: 1 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-2.21.1.tar.bz2 +Source0: yast2-ldap-%{version}.tar.bz2 -Prefix: /usr - -Group: System/YaST -License: GPL-2.0+ -BuildRequires: doxygen gcc-c++ libldapcpp-devel libxcrypt-devel yast2 yast2-core-devel yast2-devtools +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libldapcpp-devel +BuildRequires: libtool +BuildRequires: libxcrypt-devel +BuildRequires: yast2 +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools Summary: YaST2 - LDAP Agent +License: GPL-2.0+ +Group: System/YaST Requires: ldapcpplib yast2 %description @@ -39,26 +41,26 @@ enables searching the LDAP tree and adding/deleting/modifying items on an LDAP server. %prep -%setup -n yast2-ldap-2.21.1 +%setup -n yast2-ldap-%{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 @@ -73,5 +75,6 @@ rm -rf "$RPM_BUILD_ROOT" %{_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 +%doc %{_prefix}/share/doc/packages/yast2-ldap + %changelog