summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2012-02-08 13:21:43 +0200
committerAlexander Bokovoy <abokovoy@redhat.com>2012-02-08 13:24:40 +0200
commit69036a0781584eeb299d7a45fcbf0990ff93556f (patch)
tree3dfd40975319d57ed0a13d4aaf7d2755fb22cbf8
parent6f51e4fb0aa1cd36e13a6a2888a20f4c8c41fe81 (diff)
downloadsamba4-69036a0781584eeb299d7a45fcbf0990ff93556f.tar.gz
samba4-69036a0781584eeb299d7a45fcbf0990ff93556f.tar.xz
samba4-69036a0781584eeb299d7a45fcbf0990ff93556f.zip
Update spec file to build on Fedora 16
- Removed Parse::Yapp installables as it makes samba-pidl to conflict with appropriate Perl module - Python subpackage components are installed into python_sitearch only, if python_sitelib is mentioned, build fails because the directory does not exist in the build root. Adding directory there would make empty directory packaged which we certainly don't want. - Made more explicit packaging of Pidl components - Enforced executable bits on samba winbind components to get appropriate provides generated. Without these requires are generated towards libraries in the same subpackage but never satisfied as no provides are generated.
-rw-r--r--samba4.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/samba4.spec b/samba4.spec
index a508239..622beb2 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -433,8 +433,10 @@ rm -rf %{buildroot}/%{_datadir}/perl5
install -d -m 0755 %{buildroot}%{_libdir}
install -d -m 0755 %{buildroot}/%{_lib}
mv -f %{buildroot}/%{_libdir}/libnss_winbind.so.2 %{buildroot}/%{_lib}/libnss_winbind.so.2
+chmod 0755 %{buildroot}/%{_lib}/libnss_winbind.so.2
ln -sf /%{_lib}/libnss_winbind.so.2 %{buildroot}%{_libdir}/libnss_winbind.so
mv -f %{buildroot}/%{_libdir}/libnss_wins.so.2 %{buildroot}/%{_lib}/libnss_wins.so.2
+chmod 0755 %{buildroot}/%{_lib}/libnss_wins.so.2
ln -sf /%{_lib}/libnss_wins.so.2 %{buildroot}%{_libdir}/libnss_wins.so
# pdb FIXME
@@ -475,6 +477,8 @@ rm -f %{buildroot}/%{_mandir}/man3/talloc.3*
# Clean out crap left behind by the PIDL install.
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+rm -f %{buildroot}%{perl_vendorlib}/wscript_build
+rm -rf %{buildroot}%{perl_vendorlib}/Parse/Yapp
#find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
# This makes the right links, as rpmlint requires that
@@ -1027,13 +1031,12 @@ rm -rf %{buildroot}
%files python
%defattr(-,root,root,-)
%{python_sitearch}/*
-%{python_sitelib}/*
%files pidl
%defattr(-,root,root,-)
-%{perl_vendorlib}/*
+%{perl_vendorlib}/Parse/Pidl*
%{_mandir}/man1/pidl*
-%{_mandir}/man3/Parse*
+%{_mandir}/man3/Parse::Pidl*
%attr(755,root,root) %{_bindir}/pidl
%files swat