Hello community,
here is the log from the commit of package orage for openSUSE:12.1 checked in
at 2011-10-25 16:46:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/orage (Old)
and /work/SRC/openSUSE:12.1/.orage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orage", Maintainer is "xfce-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:12.1/orage/orage.changes 2011-10-24 13:13:42.000000000
+0200
+++ /work/SRC/openSUSE:12.1/.orage.new/orage.changes 2011-10-25
16:47:09.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct 20 20:44:41 UTC 2011 - g...@opensuse.org
+
+- added orage-4.8.2-use-docdir.patch in order to use docdir
+ correctly
+- install HTML documentation under /usr/share/xfce4/orage/html
+- make the file list a bit more explicit
+
+-------------------------------------------------------------------
New:
----
orage-4.8.2-use-docdir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ orage.spec ++++++
--- /var/tmp/diff_new_pack.cz9Bav/_old 2011-10-25 16:47:13.000000000 +0200
+++ /var/tmp/diff_new_pack.cz9Bav/_new 2011-10-25 16:47:13.000000000 +0200
@@ -26,6 +26,8 @@
Group: Productivity/Office/Organizers
Source: %{name}-%{version}.tar.bz2
Source1: README.SUSE
+# PATCH-FIX-UPSTREAM orage-4.8.2-use-docdir.patch g...@opensuse.org -- Use
docdir correctly
+Patch0: orage-4.8.2-use-docdir.patch
BuildRequires: intltool
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-2.0)
@@ -53,18 +55,21 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
cp %{SOURCE1} .
sed -i 's:^Icon=clock:Icon=xfcalendar:' globaltime/globaltime.desktop.in
%build
+xdt-autogen
# workaround broken libical headers
export CFLAGS="%{optflags} -I%{_includedir}/libical"
-%configure
+%configure --docdir=%{_datadir}/xfce4/orage/html
make %{?_smp_mflags}
%install
%make_install
-install -D -m 644 icons/48x48/xfcalendar.png
%{buildroot}%{_datadir}/pixmaps/xfcalendar.png
+install -D -p -m 644 icons/48x48/xfcalendar.png \
+ %{buildroot}%{_datadir}/pixmaps/xfcalendar.png
rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%fdupes %{buildroot}%{_datadir}
%find_lang %{name}
@@ -89,18 +94,22 @@
%files
%defattr(-,root,root)
%doc README ChangeLog COPYING AUTHORS NEWS README.SUSE
-%doc %{_datadir}/orage/doc/
+%dir %{_datadir}/xfce4
+%dir %{_datadir}/xfce4/orage
+%doc %{_datadir}/xfce4/orage/html/
%{_bindir}/orage
%{_bindir}/globaltime
%{_bindir}/tz_convert
-%{_datadir}/orage/
-%doc %{_mandir}/man1/*
+%doc %{_mandir}/man1/globaltime.1*
+%doc %{_mandir}/man1/orage.1*
+%doc %{_mandir}/man1/tz_convert.1*
+%dir %{_datadir}/%{name}
%{_datadir}/orage/sounds/
%{_datadir}/applications/*desktop
%{_datadir}/icons/hicolor/*
%{_datadir}/pixmaps/xfcalendar.png
%{_datadir}/dbus-1/services/org.xfce.*
-%{_libexecdir}/xfce4/
+%{_libexecdir}/xfce4/panel-plugins/xfce4-orageclock-plugin
%{_datadir}/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
%files lang -f %{name}.lang
++++++ orage-4.8.2-use-docdir.patch ++++++
Index: orage-4.8.2/doc/C/Makefile.am
===================================================================
--- orage-4.8.2.orig/doc/C/Makefile.am
+++ orage-4.8.2/doc/C/Makefile.am
@@ -4,12 +4,12 @@ SUBDIRS = \
noinst_DATA = \
orage.xml
-docdir=$(datadir)/orage/doc/C
+cdocdir=$(docdir)/C
-doc_DATA= \
+cdoc_DATA= \
orage.html
-EXTRA_DIST = $(noinst_DATA) $(doc_DATA)
+EXTRA_DIST = $(noinst_DATA) $(cdoc_DATA)
html: $(srcdir)/orage.xml
xsltproc $(top_srcdir)/doc/xfce-nochunk.xsl \
Index: orage-4.8.2/doc/C/images/Makefile.am
===================================================================
--- orage-4.8.2.orig/doc/C/images/Makefile.am
+++ orage-4.8.2/doc/C/images/Makefile.am
@@ -1,5 +1,5 @@
-imagesdir = $(datadir)/orage/doc/C/images
-images_DATA = \
+cimagesdir = $(docdir)/C/images
+cimages_DATA = \
default_calendar.png \
orage_calendar_edit_menu.png \
orage_calendar_file_menu.png \
@@ -18,4 +18,4 @@ images_DATA = \
orage_preferences_main.png \
orage_preferences_extra.png
-EXTRA_DIST = $(images_DATA)
+EXTRA_DIST = $(cimages_DATA)
Index: orage-4.8.2/src/Makefile.am
===================================================================
--- orage-4.8.2.orig/src/Makefile.am
+++ orage-4.8.2/src/Makefile.am
@@ -38,7 +38,8 @@ orage_SOURCES = \
orage_CFLAGS = \
$(LIBGTK_CFLAGS) \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
+ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+ -DPACKAGE_DOC_DIR=\""$(docdir)"\"
orage_LDADD = \
$(LIBGTK_LIBS) \
Index: orage-4.8.2/src/mainbox.c
===================================================================
--- orage-4.8.2.orig/src/mainbox.c
+++ orage-4.8.2/src/mainbox.c
@@ -193,9 +193,7 @@ static void mHelp_help_activate_cb(GtkMe
#ifdef ORAGE_DEBUG
orage_message(-100, P_N);
#endif
- helpdoc = g_strconcat("firefox ", PACKAGE_DATA_DIR
- , G_DIR_SEPARATOR_S, "orage"
- , G_DIR_SEPARATOR_S, "doc"
+ helpdoc = g_strconcat("firefox ", PACKAGE_DOC_DIR
, G_DIR_SEPARATOR_S, "C"
, G_DIR_SEPARATOR_S, "orage.html"
, NULL);
Index: orage-4.8.2/src/parameters.c
===================================================================
--- orage-4.8.2.orig/src/parameters.c
+++ orage-4.8.2/src/parameters.c
@@ -171,9 +171,7 @@ static void dialog_response(GtkWidget *d
if (response_id == GTK_RESPONSE_HELP) {
/* Needs to be in " to keep # */
- helpdoc = g_strconcat("firefox \"", PACKAGE_DATA_DIR
- , G_DIR_SEPARATOR_S, "orage"
- , G_DIR_SEPARATOR_S, "doc"
+ helpdoc = g_strconcat("firefox \"", PACKAGE_DOC_DIR
, G_DIR_SEPARATOR_S, "C"
, G_DIR_SEPARATOR_S, "orage.html#orage-preferences-window\""
, NULL);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
