- added nolibs patch (remove -lnsl and co.)

[packages/evolution.git] / evolution.spec

diff --git a/evolution.spec b/evolution.spec
index 11f4f5aa3ccf28597c2db4c0e26b1fe5f57d2c4f..dbf2523bbf88c07e663eb20a487d14da44c7ac55 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,5 @@
-%define                mver            1.3
-%define                subver  3
+%define                mver            1.4
+%define                subver  0
 %define                _db3ver 3.1.17
 %define                _dbdir  $RPM_BUILD_DIR/%{name}-%{version}/db3-headers-%{_db3ver}
 
@@ -9,16 +9,17 @@ Summary(pt_BR):       Cliente de email integrado com calend
 Summary(zh_CN):        Evolution - GNOME2¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:          evolution
 Version:       %{mver}.%{subver}
-Release:       0.1
+Release:       1
 License:       GPL
 Group:         Applications/Mail
-Source0:       ftp://ftp.gnome.org/mirror/gnome.org/sources/evolution/%{mver}/%{name}-%{version}.tar.bz2
-Source1:       %{name}-db3-headers-%{_db3ver}.tar.bz2
+Source0:       http://ftp.gnome.org/mirror/gnome.org/sources/evolution/%{mver}/%{name}-%{version}.tar.bz2
+# Source0-md5: cc671769a912e315dc895f5b458e1a33
+Source1:       http://www.t17.ds.pwr.wroc.pl/~wiget/%{name}-db3-headers-%{_db3ver}.tar.bz2
+# Source1-md5: 6e5690aa2f0e5ec3e3bdfeb9106ea42a
 Patch0:                %{name}-nostaticdb3.patch
-Patch1:                %{name}-am.patch
+Patch1:                %{name}-nolibs.patch
 Patch2:                %{name}-configure_in.patch
 Patch3:                %{name}-desktop.patch
-Patch4:                %{name}-gnome_prefix.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: GConf2-devel
 BuildRequires: ORBit2-devel >= 2.3.0
@@ -27,20 +28,20 @@ BuildRequires:      automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.5
-BuildRequires: gal-devel >= 1.99.4
+BuildRequires: gal-devel >= 1:1.99.7
 BuildRequires: gettext-devel
 BuildRequires: gnome-pilot-devel >= 2.0.0
 BuildRequires: gnome-vfs2-devel
 BuildRequires: gtk+2-devel
 Buildrequires: gtk-doc >= 0.6
-BuildRequires: gtkhtml-devel >= 3.0.3
+BuildRequires: gtkhtml-devel >= 3.0.5
 BuildRequires: intltool >= 0.18
 BuildRequires: libbonoboui-devel
 BuildRequires: libglade2-devel
 BuildRequires: libgnomecanvas-devel
 BuildRequires: libgnomeprintui-devel >= 2.2.1
 BuildRequires: libgnomeui-devel
-BuildRequires: libsoup-devel >= 1.99.20
+BuildRequires: libsoup-devel >= 1.99.23
 BuildRequires: libtool
 BuildRequires: libunicode-devel >= 0.4
 BuildRequires: libxml2
@@ -59,8 +60,8 @@ Requires(post):               GConf2
 Requires:      GConf2
 Requires:      bonobo-activation
 Requires:      db3 = %{_db3ver}
-Requires:      gal >= 1.99.4
-Requires:      gtkhtml >= 3.0.3
+Requires:      gal >= 1:1.99.7
+Requires:      gtkhtml >= 3.0.5
 Requires:      libglade2
 Requires:      psmisc
 Requires:      scrollkeeper >= 0.1.4
@@ -89,9 +90,9 @@ Summary(zh_CN):       Evolution
 Group:         Development/Libraries
 Requires:      cyrus-sasl-devel
 Requires:      freetype-devel
-Requires:      gal-devel >= 1.99.4
+Requires:      gal-devel >= 1:1.99.7
 Requires:      gnome-vfs2-devel
-Requires:      gtkhtml-devel >= 3.0.3
+Requires:      gtkhtml-devel >= 3.0.5
 Requires:      libglade2-devel
 Requires:      libgnomeprintui-devel >= 2.2.1
 Requires:      libgnomeui-devel
@@ -149,12 +150,11 @@ Ten pakiet zawiera dodatki do synchronizacji danych Evolution z
 Palmem.
 
 %prep
-%setup -q -a 1
+%setup -q -a1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 rm -f missing
@@ -166,13 +166,12 @@ intltoolize --copy --force
 %{__autoconf}
 %{__automake}
 cd libical
-# workaround for libtoolize to install ltmain.sh in . not ..
-touch install-sh
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
-%{__automake}
+# don't use -f here
+automake -a -c --foreign
 cd ..
 %configure \
        --enable-gtk-doc \
@@ -191,6 +190,10 @@ cd ..
        --with-db3-libs=/lib \
        --with-kde-applnk-path=no
 
+# hack to rebuild *.c and *.h from *.idl (check if needed with new versions)
+# (required if you use ORBit2-devel 2.7.2)
+find -name \*.idl -exec touch {} \;
+
 %{__make} \
        GTKHTML_DATADIR=%{_datadir}/idl
 
@@ -203,19 +206,18 @@ rm -rf $RPM_BUILD_ROOT
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
        GTKHTML_DATADIR=%{_datadir}/idl
 
-# strip doesn't pass this files and they aren't necessary, so remove them
+# strip doesn't pass these files and they aren't necessary, so remove them
 # probably this should be done differently, but I have no idea
 rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{mver}/*/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{mver}/libemiscwidgets.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang evolution-1.4 --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig %{_libdir}/evolution/%{mver}
 /sbin/ldconfig
 /usr/bin/scrollkeeper-update
 %gconf_schema_install
@@ -224,12 +226,12 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 /usr/bin/scrollkeeper-update
 
-%files -f %{name}.lang
+%files -f evolution-1.4.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS* README 
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/evolution/*/*/*.so*
-%attr(755,root,root) %{_libdir}/evolution/%{mver}/*.so.*.*.*
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/*.so.*
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/camel/*
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-alarm-notify
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-ldif-importer
@@ -240,6 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/evolution-launch-composer
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/csv2vcard
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/killev
+%attr(755,root,root) %{_libdir}/evolution/%{mver}/load-*
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{mver}
 %dir %{_libdir}/evolution/%{mver}/camel*
@@ -258,17 +261,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/%{mver}/glade
 %{_datadir}/evolution/%{mver}/images
 %{_datadir}/evolution/%{mver}/ui
-%dir %{_datadir}/evolution/%{mver}/tools
-%attr(755,root,root) %{_datadir}/evolution/%{mver}/tools/*
 %{_datadir}/evolution/%{mver}/views
 %{_datadir}/evolution/%{mver}/zoneinfo
 %{_datadir}/mime-info/*
 %{_datadir}/idl/*
-%{_datadir}/applications/*
+%{_desktopdir}/*
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_omf_dest_dir}/%{name}
-%{_datadir}/gnome/help/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -284,5 +284,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files pilot
 %defattr(644,root,root,755)
-%{_libdir}/gnome-pilot/conduits/*
+%attr(755,root,root) %{_libdir}/gnome-pilot/conduits/*
 %{_datadir}/gnome-pilot/conduits/*