[mongoose/f16: 7/7] Merge branch 'f16' of ssh://pkgs.fedoraproject.org/mongoose into f16

[Florencia Fotorello]

commit bcf0fe8610008a0b5b8ce746dacf82bc24b18db8
Merge: 954d03e ca592c7
Author: Florencia Fotorello <ffotorel at redhat.com>
Date:   Tue Aug 21 09:14:46 2012 -0300

    Merge branch 'f16' of ssh://pkgs.fedoraproject.org/mongoose into f16
    
    Conflicts:
    	mongoose.spec

 mongoose.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc mongoose.spec
index 1160e9f,9d2f586..1107460
--- a/mongoose.spec
+++ b/mongoose.spec
@@@ -84,29 -50,9 +84,29 @@@ ln -s %{_libdir}/lib%{name}.so.$VERSIO
  %{_bindir}/%{name}
  %{_mandir}/man1/%{name}.1*
  
 +%files lib
 +%defattr(-,root,root,-)
 +%{_libdir}/lib%{name}.so.* 
 +
 +%files devel
 +%defattr(-,root,root,-)
 +%{_includedir}/%{name}.h
 +%{_libdir}/lib%{name}.so
 +
  %changelog
 +* Mon Aug 15 2012 Florencia Fotorello <ffotorel at redhat dot com> - 3.1-1
 +- Repackage mongoose for all stable branches (840999)
 +
 +* Thu Jul  5 2012 Rafael Azenha Aquini <aquini at linux dot com> - 3.1-1
 +- Packaged mongoose's upstream 3.1 release.
 +- Introduced -lib -devel sub-packages (804843)
 +- Change build option to -DNO_SSL_DL (804844)
 +
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Sat Aug 27 2011 Rafael Azenha Aquini <aquini at linux dot com> - 3.0-2
- - Add upstream patch to fix CVE-2011-2900 (729146) 
+ - Add upstream patch to fix CVE-2011-2900 (729146)
  
  * Mon Jul 25 2011 Rafael Azenha Aquini <aquini at linux dot com> - 3.0-1
  - Rebuilt for Fedora's inclusion, after scracth-build successful tests.