Kolab Groupware OBS

Changes of Revision 5

php-pear-Net-LDAP2.spec Changed

@@ -2,36 +2,40 @@
 
 # Needed for openSUSE
 %if 0%{?suse_version}
-%{!?pear_cfgdir:    %{expand: %%global pear_cfgdir %(%{__pear} config-get cfg_dir  2> /dev/null || echo undefined)}}
-%{!?pear_datadir:   %{expand: %%global pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}}
-%{!?pear_docdir:    %{expand: %%global pear_docdir %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}}
-%{!?pear_metadir:   %{expand: %%global pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo undefined)}}
-%{!?pear_phpdir:    %{expand: %%global pear_phpdir %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}}
-%{!?pear_testdir:   %{expand: %%global pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}}
-%{!?pear_wwwdir:    %{expand: %%global pear_wwwdir %(%{__pear} config-get www_dir  2> /dev/null || echo undefined)}}
+%{!?pear_cfgdir:    %global pear_cfgdir %(%{__pear} config-get cfg_dir  2> /dev/null || echo undefined)}
+%{!?pear_datadir:   %global pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
+%{!?pear_docdir:    %global pear_docdir %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
+%{!?pear_metadir:   %global pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo undefined)}
+%{!?pear_phpdir:    %global pear_phpdir %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
+%{!?pear_testdir:   %global pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
+%{!?pear_wwwdir:    %global pear_wwwdir %(%{__pear} config-get www_dir  2> /dev/null || echo undefined)}
 %{!?pear_xmldir:    %global pear_xmldir %{_localstatedir}/lib/pear/pkgxml}
 %endif
 
 %global pear_name Net_LDAP2
 
-Name:           php-pear-Net-LDAP2
-Version:        2.0.9
-Release:        3%{?dist}
-Summary:        Object oriented interface for searching and manipulating LDAP-entries
-Group:          Development/Libraries
-License:        LGPLv3
-URL:            http://pear.php.net/package/Net_LDAP2
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+%if 0%{suse_version}
+Name:               php5-pear-Net_LDAP2
+%else
+Name:               php-pear-Net-LDAP2
+%endif
+Version:            2.0.9
+Release:            3%{?dist}
+Summary:            Object oriented interface for searching and manipulating LDAP-entries
+Group:              Development/Libraries
+License:            LGPLv3
+URL:                http://pear.php.net/package/Net_LDAP2
+Source0:            http://pear.php.net/get/%{pear_name}-%{version}.tgz
+BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:          noarch
 
-BuildRequires:  php-pear
+BuildRequires:      php-pear
 
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
-Requires:       php-pear
+Requires(post):     %{__pear}
+Requires(postun):   %{__pear}
+Requires:           php-pear
 
-Provides:       php-pear(%{pear_name}) = %{version}-%{release}
+Provides:           php-pear(%{pear_name}) = %{version}-%{release}
 
 %description
 Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP
@@ -71,6 +75,10 @@
 
 popd
 
+# For troubleshooting macros:
+
+echo "pear_metadir: '%{pear_metadir}'"
+
 %check
 # Sanity check
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)