diff -ruN tomboy.orig/tomboy.spec.in tomboy/tomboy.spec.in --- tomboy.orig/tomboy.spec.in 2005-05-30 10:18:27.000000000 +0100 +++ tomboy/tomboy.spec.in 2005-05-30 10:27:13.000000000 +0100 @@ -1,3 +1,6 @@ +%{?_with_suse:%define suse 1} +%{!?_with_suse:%define suse 0} + Name: @PACKAGE@ Version: @VERSION@ Release: 1 @@ -15,13 +18,45 @@ BuildRequires: atk-devel >= 1.2.4 BuildRequires: gtkspell-devel BuildRequires: gtk-sharp -%{?_with_dbus:BuildRequires: dbus-sharp} +%if %{suse} + %{?_with_dbus:BuildRequires: dbus-mono} +%else + %{?_with_dbus:BuildRequires: dbus-sharp} +%endif Requires: gtk2-devel >= 2.2.3 Requires: atk-devel >= 1.2.4 Requires: gtkspell Requires: gtk-sharp Requires: libpanel-applet-2.so.0 -%{?_with_dbus:Requires: dbus-sharp} +%if %{suse} + %{?_with_dbus:Requires: dbus-mono} +%else + %{?_with_dbus:Requires: dbus-sharp} +%endif + + +%define suse_prefix /opt/gnome +%define suse_sysconfdir /etc%{suse_prefix} +%define suse_bindir %{suse_prefix}/bin +%define suse_libdir %{suse_prefix}/lib +%define suse_datadir %{suse_prefix}/share +%define suse_mandir %{suse_datadir}/man + +%if %{suse} + %define prefix %{suse_prefix} + %define sysconfdir %{suse_sysconfdir} + %define bindir %{suse_bindir} + %define libdir %{suse_libdir} + %define datadir %{suse_datadir} + %define mandir %{suse_mandir} +%else + %define prefix %{_prefix} + %define sysconfdir %{_sysconfdir} + %define bindir %{_bindir} + %define libdir %{_libdir} + %define datadir %{_datadir} + %define mandir %{_mandir} +%endif %description Tomboy is a desktop note-taking application for Linux and Unix. Simple and easy @@ -33,14 +68,16 @@ renaming and reorganizing them. Available rpmbuild rebuild options : ---with : dbus +--with : dbus suse %prep %setup -q %build -%configure %{!?_with_dbus: --enable-dbus=no} +./configure %{!?_with_dbus: --enable-dbus=no} \ +--prefix=%{prefix} --sysconfdir=%{sysconfdir} --bindir=%{bindir} \ +--libdir=%{libdir} --datadir=%{datadir} --mandir=%{mandir} %{__make} %{?_smp_mflags} @@ -72,21 +109,25 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/Plugins -%{_bindir}/%{name} -%{_libdir}/%{name}/* -%{_libdir}/%{name}/Plugins/* -%{_libdir}/bonobo/servers/GNOME_TomboyApplet.server -%{_libdir}/pkgconfig/*.pc +%dir %{libdir}/%{name} +%dir %{libdir}/%{name}/Plugins +%{bindir}/%{name} +%{libdir}/%{name}/* +%{libdir}/%{name}/Plugins/* +%{libdir}/bonobo/servers/GNOME_TomboyApplet.server +%{libdir}/pkgconfig/*.pc %{?_with_dbus:%{_libdir}/dbus-1.0/services/com.beatniksoftware.Tomboy.service} -%{_mandir}/man1/%{name}.1.gz -###%{_datadir}/applications/tomboy.desktop -%{_datadir}/gnome-2.0/ui/GNOME_TomboyApplet.xml -%{_datadir}/pixmaps/tintin.png -%{_sysconfdir}/gconf/schemas/tomboy.schemas +%{mandir}/man1/%{name}.1.gz +###%{datadir}/applications/tomboy.desktop +%{datadir}/gnome-2.0/ui/GNOME_TomboyApplet.xml +%{datadir}/pixmaps/tintin.png +%{sysconfdir}/gconf/schemas/tomboy.schemas %changelog +* Mon May 30 2005 James Ogley +- Add support for --with suse to build on SuSE Linux +- Creates possibility of (for example) --with mandrake --with foo --with bar etc + * Fri Oct 08 2004 Alex Graveley - 0.2 - Update to add .schemas, .desktop, .service, %find_lang, and %doc files.