git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1fe26e6
)
More updates for spec file, for alpha5
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 30 Jun 2008 09:34:02 +0000
(19:34 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Mon, 30 Jun 2008 09:34:02 +0000
(19:34 +1000)
(This used to be commit
6459adb6ac2bf94a1e60c1450dbef43360f30888
)
packaging/Fedora/samba4.spec
patch
|
blob
|
history
diff --git
a/packaging/Fedora/samba4.spec
b/packaging/Fedora/samba4.spec
index 4e4de03ad30cff624ae73add536209b18532dea8..567d89bd5d771b903a079110c672ef1456c60bff 100644
(file)
--- a/
packaging/Fedora/samba4.spec
+++ b/
packaging/Fedora/samba4.spec
@@
-160,7
+160,11
@@
rm -rf $RPM_BUILD_ROOT
cd source
#Don't call 'make install' as we want to call out to the PIDL install manually
cd source
#Don't call 'make install' as we want to call out to the PIDL install manually
-make installbin installdat installswat installmisc installlib installheader installpc installplugins installpython DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
+
+#Undo the PIDL install, we want to try again with the right options
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/perl5
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/perl5
#Install PIDL
( cd pidl && make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT )
#Install PIDL
( cd pidl && make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT )
@@
-214,13
+218,15
@@
rm $RPM_BUILD_ROOT/%{_bindir}/setnttoken
rm $RPM_BUILD_ROOT/%{_bindir}/getntacl
rm $RPM_BUILD_ROOT/%{_datadir}/samba/js/base.js
rm $RPM_BUILD_ROOT/%{_bindir}/getntacl
rm $RPM_BUILD_ROOT/%{_datadir}/samba/js/base.js
+#This makes the right links, as rpmlint requires that the
+#ldconfig-created links be recorded in the RPM.
/sbin/ldconfig -N -n $RPM_BUILD_ROOT/%{_libdir}
#Fix up permission on perl install
%{_fixperms} $RPM_BUILD_ROOT/%{perl_vendorlib}
#Fix up permissions in source tree, for debuginfo
/sbin/ldconfig -N -n $RPM_BUILD_ROOT/%{_libdir}
#Fix up permission on perl install
%{_fixperms} $RPM_BUILD_ROOT/%{perl_vendorlib}
#Fix up permissions in source tree, for debuginfo
-find -type f | xargs chmod -x
+find
source/heimdal
-type f | xargs chmod -x
%clean
rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@
-268,7
+274,8
@@
exit 0
%dir %{_datadir}/samba
%{_datadir}/samba/*.dat
%{_libdir}/*.so.*
%dir %{_datadir}/samba
%{_datadir}/samba/*.dat
%{_libdir}/*.so.*
-%{_libdir}/samba
+#Only needed if Samba's build produces plugins
+#%{_libdir}/samba
%dir %{_sysconfdir}/%{name}
#Need to mark this as being owned by Samba, but it is normally created
#by the provision script, which runs best if there is no existing
%dir %{_sysconfdir}/%{name}
#Need to mark this as being owned by Samba, but it is normally created
#by the provision script, which runs best if there is no existing
@@
-346,5
+353,9
@@
exit 0
%doc WHATSNEW.txt
%changelog
%doc WHATSNEW.txt
%changelog
+* Mon Jun 30 2008 Andrew Bartlett <abartlet@samba.org> - 0:4.0.0-0.2.alpha5.fc9
+- Update per review feedback
+- Update for alpha5
+
* Thu Jun 26 2008 Andrew Bartlett <abartlet@samba.org> - 0:4.0.0-0.1.alpha4.fc9
- Rework Fedora's Samba 3.2.0-1.rc2.16 spec file for Samba4
* Thu Jun 26 2008 Andrew Bartlett <abartlet@samba.org> - 0:4.0.0-0.1.alpha4.fc9
- Rework Fedora's Samba 3.2.0-1.rc2.16 spec file for Samba4