- updated to 1.0.0.beta3

- License is BSD

Changed files:
    efreet.spec -> 1.13

diff --git a/efreet.spec b/efreet.spec
index 931193d615727decbc22960ce9c93e9f1bc17bce..7e412ed6f21386c7c9f7f4d445037a2cb28786a0 100644 (file)
--- a/efreet.spec
+++ b/efreet.spec
@@ -3,7 +3,7 @@
 %bcond_without static_libs     # don't build static library
 #
 %define                ecore_ver       1.0.0
-%define                svn             %{nil}
+%define                eet_ver         1.4.0
 
 Summary:       freedesktop.org standards implementation for the EFL
 Summary(pl.UTF-8):     Implementacja standardów freedesktop.org dla EFL
@@ -11,18 +11,20 @@ Name:               efreet
 %define        subver  beta2
 Version:       1.0.0
 Release:       0.%{subver}.1
-License:       LGPL v2.1
+License:       BSD
 Group:         X11/Libraries
 Source0:       http://download.enlightenment.org/releases/%{name}-%{version}.%{subver}.tar.bz2
 # Source0-md5: 75c36c92d09f3d8737ce10cabe6a1535
 URL:           http://enlightenment.org/p.php?p=about/libs/efreet
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1.6
-# ecore-file; ecore-desktop for tests
 BuildRequires: ecore-devel >= %{ecore_ver}
+BuildRequires: ecore-file-devel >= %{ecore_ver}
+BuildRequires: eet-devel >= %{eet_ver}
 BuildRequires: libtool
-BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
+BuildRequires: pkgconfig >= 1:0.22
+Requires:      eet >= %{eet_ver}
+Requires:      ecore >= %{ecore_ver}
 Requires:      ecore-file >= %{ecore_ver}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,8 +61,9 @@ Summary:      Efreet header files
 Summary(pl.UTF-8):     Pliki nagłówkowe Efreet
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-# ecore-file
-BuildRequires: ecore-devel >= %{ecore_ver}
+Requires:      ecore-devel >= %{ecore_ver}
+Requires:      ecore-file-devel >= %{ecore_ver}
+Requires:      eet-devel >= %{eet_ver}
 
 %description devel
 Header files for Efreet.
@@ -83,8 +86,6 @@ Statyczna biblioteka Efreet.
 %prep
 %setup -q -n %{name}-%{version}.%{subver}
 
-sed -i -e 's/-g -O0//' src/lib/Makefile.am
-
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -92,8 +93,9 @@ sed -i -e 's/-g -O0//' src/lib/Makefile.am
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        %{!?with_static_libs:--disable-static}
-%{__make} V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,8 +104,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # just tests
-rm -f $RPM_BUILD_ROOT%{_bindir}/efreet_{alloc,menu_alloc,test,spec_test,cache_test}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/test
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/efreet_{alloc,menu_alloc,test,spec_test,cache_test}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,12 +116,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING README TODO
-%attr(755,root,root) %{_libdir}/libefreet%{svn}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libefreet%{svn}.so.1
-%attr(755,root,root) %{_libdir}/libefreet_mime%{svn}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libefreet_mime%{svn}.so.1
-%attr(755,root,root) %{_libdir}/libefreet_trash%{svn}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libefreet_trash%{svn}.so.1
+%attr(755,root,root) %{_libdir}/libefreet.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libefreet.so.1
+%attr(755,root,root) %{_libdir}/libefreet_mime.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libefreet_mime.so.1
+%attr(755,root,root) %{_libdir}/libefreet_trash.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libefreet_trash.so.1
+%dir %{_libdir}/efreet
+%attr(755,root,root) %{_libdir}/efreet/efreet_desktop_cache_create
 
 %files devel
 %defattr(644,root,root,755)
@@ -129,8 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libefreet.la
 %{_libdir}/libefreet_mime.la
 %{_libdir}/libefreet_trash.la
-%dir %{_includedir}/efreet-1
-%{_includedir}/efreet-1/*.h
+%{_includedir}/efreet-1
 %{_pkgconfigdir}/efreet.pc
 %{_pkgconfigdir}/efreet-mime.pc
 %{_pkgconfigdir}/efreet-trash.pc