Attachment 145200 Details for Bug 196401 – spec file diffs

[patch] spec file diffs

cvsdiffs (text/plain), 3.30 KB, created by Rich Megginson on 2007-01-09 22:00:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-01-09 22:00:44 UTC

Size: 3.30 KB

patch

obsolete

>Index: mozldap.spec
>===================================================================
>RCS file: /cvsroot/mozilla/directory/c-sdk/mozldap.spec,v
>retrieving revision 5.7
>retrieving revision 5.8
>diff -u -8 -r5.7 -r5.8
>--- mozldap.spec	9 Jan 2007 18:43:02 -0000	5.7
>+++ mozldap.spec	9 Jan 2007 21:32:25 -0000	5.8
>@@ -8,17 +8,17 @@
> %define major           6
> %define minor           0
> %define submin          1
> %define libsuffix       %{major}0
> 
> Summary:          Mozilla LDAP C SDK
> Name:             mozldap
> Version:          %{major}.%{minor}.%{submin}
>-Release:          1%{?dist}
>+Release:          2%{?dist}
> License:          MPL/GPL/LGPL
> URL:              http://www.mozilla.org/directory/csdk.html
> Group:            System Environment/Libraries
> Requires:         %{nspr_name} >= %{nspr_version}
> Requires:         %{nss_name} >= %{nss_version}
> Requires:         %{svrcore_name} >= %{svrcore_version}
> Requires:         cyrus-sasl-lib
> BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>@@ -62,18 +62,16 @@
> 
> %description devel
> Header and Library files for doing development with the Mozilla LDAP C SDK
> 
> %prep
> %setup -q
> 
> %build
>-if [ $RPM_BUILD_ROOT != "/" ] ; then %{__rm} -rf $RPM_BUILD_ROOT ; fi
>-
> cd mozilla/directory/c-sdk
> 
> %configure \
> %ifarch x86_64 ppc64 ia64 s390x
>     --enable-64bit \
> %endif
>     --with-sasl \
>     --enable-clu \
>@@ -96,17 +94,17 @@
> export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
> 
> make \
> %ifarch x86_64 ppc64 ia64 s390x
>     USE_64=1
> %endif
> 
> %install
>-if [ $RPM_BUILD_ROOT != "/" ] ; then %{__rm} -rf $RPM_BUILD_ROOT ; fi
>+%{__rm} -rf $RPM_BUILD_ROOT
> 
> # Set up our package file
> %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig
> %{__cat} mozilla/directory/c-sdk/mozldap.pc.in \
>     | sed -e "s,%%libdir%%,%{_libdir},g" \
>           -e "s,%%prefix%%,%{_prefix},g" \
>           -e "s,%%major%%,%{major},g" \
>           -e "s,%%minor%%,%{minor},g" \
>@@ -149,17 +147,17 @@
> cp -r mozilla/directory/c-sdk/ldap/examples $RPM_BUILD_ROOT%{_datadir}/%{name}
> %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
> %{__install} -m 644 mozilla/directory/c-sdk/ldap/examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
> %{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldaptemplates.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
> %{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
> %{__install} -m 644 mozilla/directory/c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
> 
> %clean
>-if [ $RPM_BUILD_ROOT != "/" ] ; then %{__rm} -rf $RPM_BUILD_ROOT ; fi
>+%{__rm} -rf $RPM_BUILD_ROOT
> 
> 
> %post -p /sbin/ldconfig
> 
> 
> %postun -p /sbin/ldconfig
> 
> 
>@@ -183,16 +181,20 @@
> 
> %files devel
> %defattr(-,root,root,-)
> %{_libdir}/pkgconfig/%{name}.pc
> %{_includedir}/%{name}
> %{_datadir}/%{name}
> 
> %changelog
>+* Mon Jan  9 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.1-2
>+- Remove buildroot = "/" checking
>+- Remove buildroot removal from %%build section
>+
> * Mon Jan  8 2007 Rich Megginson <richm@stanfordalumni.org> - 6.0.1-1
> - bump version to 6.0.1
> - added libldif and ldif.h
> 
> * Fri Dec  8 2006 Axel Thimm <Axel.Thimm@ATrpms.net> - 6.0.0-2
> - Rename to mozldap.
> - move configure step to %%build section.
> - clean up excessive use of %%defines, make more Fedora like.

Actions: View | Diff

Attachments on bug 196401: 143200 | 145200