Attachment 603720 Details for Bug 847293 – diffs between f16 and f17 spec files

[patch] diffs between f16 and f17 spec files

nspr-spec-diffs-f16-and-f17.txt (text/plain), 3.22 KB, created by Elio Maldonado Batiz on 2012-08-11 20:34:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-08-11 20:34:31 UTC

Size: 3.22 KB

patch

obsolete

>--- f16/nspr.spec	2012-08-11 13:20:46.328744573 -0700
>+++ f17/nspr.spec	2012-08-11 13:20:46.445744578 -0700
>@@ -6,6 +6,7 @@ License:        MPLv2.0
> URL:            http://www.mozilla.org/projects/nspr/
> Group:          System Environment/Libraries
> BuildRoot:      %{_tmppath}/%{name}-%{version}-root
>+Conflicts:      filesystem < 3
> 
> # Sources available at ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
> # When CVS tag based snapshots are being used, refer to CVS documentation on
>@@ -25,6 +26,7 @@ Summary:        Development libraries fo
> Group:          Development/Libraries
> Requires:       nspr = %{version}-%{release}
> Requires:       pkgconfig
>+Conflicts:      filesystem < 3
> 
> %description devel
> Header files for doing development with the Netscape Portable Runtime.
>@@ -88,7 +90,6 @@ NSPR_CFLAGS=`./config/nspr-config --cfla
> NSPR_VERSION=`./config/nspr-config --version`
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
> 
>-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
> # Get rid of the things we don't want installed (per upstream)
> %{__rm} -rf \
>    $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \
>@@ -99,13 +100,6 @@ NSPR_VERSION=`./config/nspr-config --ver
>    $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
>    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
> 
>-for file in libnspr4.so libplc4.so libplds4.so
>-do
>-  mv -f $RPM_BUILD_ROOT/%{_libdir}/$file $RPM_BUILD_ROOT/%{_lib}/$file
>-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
>-done
>-
>-
> %clean
> %{__rm} -Rf $RPM_BUILD_ROOT
> 
>@@ -115,33 +109,41 @@ done
> 
> %files
> %defattr(-,root,root)
>-/%{_lib}/libnspr4.so
>-/%{_lib}/libplc4.so
>-/%{_lib}/libplds4.so
>-
>-%files devel
>-%defattr(-, root, root)
> %{_libdir}/libnspr4.so
> %{_libdir}/libplc4.so
> %{_libdir}/libplds4.so
>+
>+%files devel
>+%defattr(-, root, root)
> %{_includedir}/nspr4
> %{_libdir}/pkgconfig/nspr.pc
> %{_bindir}/nspr-config
> 
> %changelog
>-* Thu Jul 12 2012 Elio Maldonado <emaldona@redhat.com> - 4.9.1-2
>-- Retagging
>+* Wed Jul 11 2012 Elio Maldonado <emaldona@redhat.com> - 4.9.1-2
>+- Updated License: to MPLv2.0 per upstream
> 
>-* Sun Jul 08 2012 Elio Maldonado <emaldona@redhat.com> - 4.9.1-1
>+* Fri Jun 22 2012 Elio Maldonado <emaldona@redhat.com> - 4.9.1-1
> - Update to NSPR_4_9_1_RTM
>-- Update License: to MPLv2.0 per upstream
> 
>-* Wed Mar 28 2012 Elio Maldonado <emaldona@redhat.com> - 4.9-2
>+* Wed Mar 21 2012 Elio Maldonado <emaldona@redhat.com> - 4.9-2
> - Resolves: Bug 805672 - Library needs partial RELRO support added
> 
>-* Sat Mar 10 2012 Elio Maldonado <emaldona@redhat.com> - 4.9-1
>+* Wed Feb 29 2012 Elio Maldonado <emaldona@redhat.com> - 4.9-1
> - Update to NSPR_4_9_RTM
>-- Selective merge from f17, don't install everything in /usr
>+
>+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 4.9-0.2.beta3.1
>+- install everything in /usr
>+  https://fedoraproject.org/wiki/Features/UsrMove
>+
>+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 4.9-0.2.beta3.1
>+- 
>+
>+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.9-0.2.beta3
>+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>+
>+* Thu Oct 06 2011 Elio Maldonado <emaldona@redhat.com> - 4.9-0.1.beta3
>+- Update to NSPR_4_9_BETA3
> 
> * Thu Sep  8 2011 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 4.8.9-2
> - Avoid %%post/un shell invocations and dependencies.

Actions: View | Diff

Attachments on bug 847293: 603720