[ecore: 6/6] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ecore

[Dan Mashal]

commit 94594f77cdef464ee2797a6b60b5440fe8f2f2cd
Merge: 08b1700 c4ba9ce
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Aug 18 00:37:27 2013 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ecore
    
    Conflicts:
    	ecore.spec

 ecore.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc ecore.spec
index 3a12fab,663f52e..6832838
--- a/ecore.spec
+++ b/ecore.spec
@@@ -32,23 -34,10 +34,24 @@@ developing applications that use %{name
  %setup -q -n %{name}-%{version}
  
  %build
 -%configure --disable-static --enable-ecore-fb --enable-ecore-evas-fb --enable-ecore-sdl --disable-ecore-evas-directfb --disable-rpath --enable-openssl --disable-gnutls --enable-doc --enable-cares --disable-xim --enable-ecore-evas --enable-ecore-input-evas  --enable-ecore-evas-software-x11 --disable-silent-rules
 -
 -make %{?_smp_mflags}
 -make doc %{?_smp_mflags} -C doc
++<<<<<<< HEAD
 +%configure                                    \
 +           --disable-static                   \
 +           --enable-ecore-fb                  \
 +           --enable-ecore-evas-fb             \
 +           --enable-ecore-sdl                 \
 +           --disable-ecore-evas-directfb      \
 +           --disable-rpath --enable-openssl   \
 +           --disable-gnutls                   \
 +           --enable-doc                       \
 +           --enable-cares                     \
 +           --disable-xim                      \
 +           --enable-ecore-evas                \
 +           --enable-ecore-input-evas          \
 +           --enable-ecore-evas-software-x11
 +
 +make %{?_smp_mflags} V=1
 +cd doc; make doc %{?_smp_mflags}
  
  %install
  make install DESTDIR=%{buildroot} INSTALL='install -p'
@@@ -92,11 -81,11 +95,17 @@@ mv %{buildroot}%{_mandir}/man3/Examples
  %{_libdir}/pkgconfig/*.pc
  
  %changelog
 +* Sat Aug 17 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.7.8-1
 +- Update to 1.7.8
 +- Clean up spec file
 +- Clean up BRs
 +
+ * Sat Aug 17 2013 Rex Dieter <rdieter at fedoraproject.org> - 1.7.7-3
+ - tighten build deps to ensure ecore-evas component builds
+ - -devel drop explicit deps, automatic pkgconfig deps catch those already
+ - %%build: --disable-silent-rules
++>>>>>>> c4ba9ce29484797d06564a46e729017b0d81ecaf
+ 
  * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.7-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild