From 42b39e42bbdc31ee5a334e96ed546411ac5187649b1d3e948909b5c465aeea21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 31 May 2012 16:01:36 +0000 Subject: [PATCH] Install talloc.pc only on pre-12.2 and non SUSE systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=242 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 5 +++ samba.spec | 71 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 46 insertions(+), 38 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index a9ac5fa..e1a8881 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2806 +2807 Branch : 3.6.5 diff --git a/samba-doc.spec b/samba-doc.spec index 51de320..cda612f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -459,7 +459,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %changelog diff --git a/samba.changes b/samba.changes index 6464998..76f97f7 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 31 15:48:11 UTC 2012 - lmuelle@suse.com + +- Install talloc.pc only on pre-12.2 and non SUSE systems. + ------------------------------------------------------------------- Thu May 31 14:07:36 UTC 2012 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index efb229f..a883c77 100644 --- a/samba.spec +++ b/samba.spec @@ -219,7 +219,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package client @@ -260,7 +260,7 @@ binary packages of the most current Samba version, and a bug reporting how to. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -280,7 +280,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -305,7 +305,7 @@ This package contains all the Samba documentation as it is not part of the man pages. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -327,7 +327,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if %{make_utils} @@ -343,7 +343,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -376,7 +376,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -402,14 +402,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %else %description -n libsmbclient0 -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -448,7 +448,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libnetapi0 @@ -461,7 +461,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libnetapi-devel @@ -480,7 +480,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -501,14 +501,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %else %description -n libsmbsharemodes0 -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -534,7 +534,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libwbclient0 @@ -547,7 +547,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libwbclient-devel @@ -566,7 +566,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %if 0%{?suse_version} && 0%{?suse_version} < 1211 @@ -583,7 +583,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtalloc-devel @@ -604,7 +604,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtdb1 @@ -619,7 +619,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtdb-devel @@ -636,7 +636,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtevent0 @@ -651,7 +651,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libtevent-devel @@ -673,7 +673,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libldb1 @@ -689,7 +689,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %package -n libldb-devel @@ -710,7 +710,7 @@ Requires: libtalloc-devel This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -730,7 +730,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. -Source Timestamp: 2806 +Source Timestamp: 2807 Branch : 3.6.5 %endif @@ -1023,6 +1023,7 @@ make -C source3/ install \ make -C lib/talloc/ install \ DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} +install -m 0644 source3/pkgconfig/talloc.pc %{buildroot}/%{_libdir}/pkgconfig # libtevent make -C lib/talloc/ install \ DESTDIR=%{buildroot} \ @@ -1033,7 +1034,7 @@ rm -r %{buildroot}/%{python_sitearch} \ %endif -for file in source3/pkgconfig/*.pc; do +for file in source3/pkgconfig/{netapi,smbclient,smbsharemodes,wbclient}.pc; do install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig done # utility scripts @@ -1574,12 +1575,6 @@ fi %endif %{_bindir}/eventlogadm %{_bindir}/findsmb -%{_bindir}/ldbadd -%{_bindir}/ldbdel -%{_bindir}/ldbedit -%{_bindir}/ldbmodify -%{_bindir}/ldbrename -%{_bindir}/ldbsearch %{_bindir}/net %{_bindir}/nmblookup %{_bindir}/nmbstatus @@ -1598,11 +1593,19 @@ fi %{_bindir}/smbspool %{_bindir}/smbtar %{_bindir}/smbtree +%{_bindir}/testparm +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 +%{_bindir}/ldbadd +%{_bindir}/ldbdel +%{_bindir}/ldbedit +%{_bindir}/ldbmodify +%{_bindir}/ldbrename +%{_bindir}/ldbsearch %{_bindir}/tdbbackup %{_bindir}/tdbdump %{_bindir}/tdbrestore %{_bindir}/tdbtool -%{_bindir}/testparm +%endif %{_sbindir}/rc%{cifs_init_script} /%{_lib}/libnss_wins.so.2 %dir %{cups_lib_dir} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 898d4b6..986a2da 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66f926c7fe8990cbce4b63920b64b2822fe532a2016e15523994a46eb5ce2c42 -size 52521 +oid sha256:2fc4215b628340689f2eddb1ee51760d0b11f8f02fc8ca3e9bc04ad256007fca +size 52529