- added dbus patch (adjust for dbus-sharp 2.0 API)

- added cairo patch (adjust cairo dll path for mono 4.8.x)
- added make patch (fix typo in Makefile)
- release 2

diff --git a/tomboy-cairo.patch b/tomboy-cairo.patch
new file mode 100644 (file)
index 0000000..7d379ed
--- /dev/null
+++ b/tomboy-cairo.patch
@@ -0,0 +1,11 @@
+--- tomboy-1.8.3/configure.in.orig     2022-04-25 22:53:59.588764498 +0200
++++ tomboy-1.8.3/configure.in  2022-04-26 06:22:13.193246775 +0200
+@@ -218,6 +218,8 @@ do
+       AC_MSG_CHECKING([for Mono 2.0 GAC for $asm.dll])
+       if test \
+               -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \
++              -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0-api/$asm.dll" -o \
++              -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0-api/$asm.dll" -o \
+               -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \
+               then \
+               AC_MSG_RESULT([found])

diff --git a/tomboy-dbus.patch b/tomboy-dbus.patch
new file mode 100644 (file)
index 0000000..1d7dda2
--- /dev/null
+++ b/tomboy-dbus.patch
@@ -0,0 +1,22 @@
+--- tomboy-1.8.3/configure.in.orig     2011-11-14 18:32:07.000000000 +0100
++++ tomboy-1.8.3/configure.in  2022-04-25 22:52:41.045856668 +0200
+@@ -172,7 +172,7 @@ AC_SUBST(DBUS_SERVICE_DIR)
+ #
+ # Check for dbus-sharp
+ #
+-PKG_CHECK_MODULES(DBUS, dbus-sharp-1.0 >= 0.4 dbus-sharp-glib-1.0 >= 0.3)
++PKG_CHECK_MODULES(DBUS, dbus-sharp-2.0 >= 0.8 dbus-sharp-glib-2.0 >= 0.6)
+ AC_SUBST(DBUS_LIBS)
+ 
+ #
+--- tomboy-1.8.3/Tomboy/RemoteControlProxy.cs.orig     2011-06-21 02:55:00.000000000 +0200
++++ tomboy-1.8.3/Tomboy/RemoteControlProxy.cs  2022-04-26 06:23:29.941836511 +0200
+@@ -52,7 +52,7 @@ namespace Tomboy
+                       BusG.Init ();
+ 
+                       RemoteControl remote_control = new RemoteControl (manager);
+-                      Bus.Session.Register (Namespace,
++                      Bus.Session.Register (
+                                             new ObjectPath (Path),
+                                             remote_control);
+ 

diff --git a/tomboy-make.patch b/tomboy-make.patch
new file mode 100644 (file)
index 0000000..96cfae8
--- /dev/null
+++ b/tomboy-make.patch
@@ -0,0 +1,11 @@
+--- tomboy-1.8.3/Tomboy/Makefile.am.orig       2011-06-25 17:59:45.000000000 +0200
++++ tomboy-1.8.3/Tomboy/Makefile.am    2022-04-26 06:21:42.296824140 +0200
+@@ -208,7 +208,7 @@ $(PANEL_WRAPPER): $(srcdir)/$(PANEL_WRAP
+           < $< > $@
+       chmod +x $(PANEL_WRAPPER)
+ 
+-$(TARGET).config: $(srcdir)/$(TARGET_NAME$).config.in Makefile
++$(TARGET).config: $(srcdir)/$(TARGET_NAME).config.in Makefile
+       sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
+           < $< > $@
+ 

diff --git a/tomboy.spec b/tomboy.spec
index 114ec146758397359eceb3119e94fde70ceb100e..f12127a8b6f8f6cf4a363d1a1d50d2d4590b1da5 100644 (file)
--- a/tomboy.spec
+++ b/tomboy.spec
@@ -1,49 +1,46 @@
-#
-#
 Summary:       Tomboy - a desktop note-taking application
 Summary(pl.UTF-8):     Tomboy - aplikacja do notatek na pulpicie
 Name:          tomboy
 Version:       1.8.3
-Release:       1
+Release:       2
 License:       LGPL v2.1
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/tomboy/1.8/%{name}-%{version}.tar.bz2
+Source0:       https://download.gnome.org/sources/tomboy/1.8/%{name}-%{version}.tar.bz2
 # Source0-md5: 760d343acc6a603ccaa1f50e4aac58af
-URL:           http://www.gnome.org/projects/tomboy/
+Patch0:                %{name}-dbus.patch
+Patch1:                %{name}-cairo.patch
+Patch2:                %{name}-make.patch
+URL:           https://wiki.gnome.org/Apps/Tomboy
 BuildRequires: GConf2-devel >= 2.26.0
+BuildRequires: atk-devel >= 1:1.2.4
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: docbook-dtd412-xml
 #BuildRequires:        dotnet-galago-sharp-devel >= 0.5.0
+BuildRequires: dotnet-gconf-sharp-devel >= 2.24.0
 BuildRequires: dotnet-gmime-sharp-devel >= 2.4.0
-BuildRequires: dotnet-gnome-desktop-sharp-devel >= 2.24.0
-BuildRequires: dotnet-gnome-sharp-devel >= 2.24.0
 BuildRequires: dotnet-gtk-sharp2-devel >= 2.12.2
-BuildRequires: dotnet-ndesk-dbus-glib-sharp-devel >= 0.3
 BuildRequires: dotnet-dbus-sharp-devel >= 0.4
 BuildRequires: dotnet-dbus-sharp-glib-devel >= 0.3
 BuildRequires: gettext-tools
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gnome-doc-utils >= 0.17.3
 BuildRequires: gtk+2-devel >= 2:2.20.0
 BuildRequires: gtkspell-devel >= 2.0.11
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: mono-addins-devel >= 0.3
+BuildRequires: mono-addins-gui-devel >= 0.3
 BuildRequires: mono-csharp >= 1.9.1
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: scrollkeeper
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
 Requires(post,preun):  GConf2
 Suggests:      galago-daemon
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
-ExclusiveArch: %{ix86} %{x8664} alpha arm hppa ppc s390 sparc sparcv9
+ExclusiveArch: %{ix86} %{x8664} %{arm} hppa ppc s390 sparc sparcv9
 ExcludeArch:   i386
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,9 +56,11 @@ pomysłów i informacji, z którymi musimy się zmagać każdego dnia.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
-%{__sed} -i -e 's/en@shaw//' po/LINGUAS
-rm -f po/en@shaw.po
+%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' Tomboy/tomboy.in
 
 %build
 %{__intltoolize}
@@ -71,11 +70,12 @@ rm -f po/en@shaw.po
 %{__autoheader}
 %{__automake}
 %configure \
+       GMCS=/usr/bin/mcs \
        --with-dbus-service-dir="%{_datadir}/dbus-1/services" \
-       --disable-update-mimedb \
-       --disable-schemas-install \
        --disable-galago \
-       --disable-scrollkeeper
+       --disable-schemas-install \
+       --disable-scrollkeeper \
+       --disable-update-mimedb
 
 %{__make} -j1
 
@@ -85,14 +85,18 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --with-omf
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
+# not supported by glibc
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/en@shaw
+
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install tomboy.schemas
-%scrollkeeper_update_post
 %update_icon_cache hicolor
 %update_mime_database
 
@@ -101,25 +105,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 %update_mime_database
-%scrollkeeper_update_postun
 %update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/tomboy
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*.exe
+%{_libdir}/%{name}/*.exe.config
 %{_libdir}/%{name}/*.exe.mdb
 %attr(755,root,root) %{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/*.la
-%{_libdir}/%{name}/*.config
 %{_libdir}/%{name}/addins
 %{_datadir}/%{name}
-%{_datadir}/dbus-1/services/*.service
-%{_desktopdir}/*.desktop
-%{_iconsdir}/hicolor/*/*/*
+%{_datadir}/dbus-1/services/org.gnome.Tomboy.service
+%{_datadir}/mime/packages/tomboy.xml
+%{_sysconfdir}/gconf/schemas/tomboy.schemas
+%{_desktopdir}/tomboy.desktop
+%{_iconsdir}/hicolor/*/apps/tomboy.*
+%{_iconsdir}/hicolor/*x*/mimetypes/application-x-note.png
 %{_mandir}/man1/tomboy.1*
+
+# -devel?
 %{_pkgconfigdir}/tomboy-addins.pc
-%{_sysconfdir}/gconf/schemas/tomboy.schemas
-%{_datadir}/mime/packages/tomboy.xml