Hello community,

here is the log from the commit of package gDesklets for openSUSE:Factory
checked in at Fri Jun 17 15:22:21 CEST 2011.



--------
--- GNOME/gDesklets/gDesklets.changes   2011-02-12 20:24:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/gDesklets/gDesklets.changes    2011-06-17 
12:54:47.000000000 +0200
@@ -1,0 +2,27 @@
+Fri Jun 17 12:20:40 CEST 2011 - vu...@opensuse.org
+
+- Update to version 0.36.3:
+  + General:
+    - Add "Check for updates" feature
+    - Add icons in several places (menus, tabs, etc.)
+    - Add metadata information about desklets
+  + 15 pieces puzzle: Add two new images
+  + Quote of the Day:
+    - Add a database with "Chuck Norris 'The Programmer' Jokes"
+    - Add basic information about the current quote number
+      and the number of quotes in the chosen database in the
+      configuration window
+  + Control:
+    - Make it easier to have multiple instances of a control in a
+      desklet
+    - Add support for dbus
+- Update gDesklets-desktop.patch: we only need to fix the MimeType
+  line, as everything else was fixed upstream (except for
+  Categories, but we change them with %suse_update_desktop_file).
+- Add gDesklets-fix-install.patch: this fixes the installation to
+  be complete, taken from upstream. Add call to autoreconf because
+  the patch touches the build system.
+- Drop gDesklets-0.36.1-am111.patch: fixed upstream.
+- Pass --disable-static to configure to not have any .a file.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  gDesklets-0.36.1-am111.patch
  gDesklets-0.36.2.tar.bz2

New:
----
  gDesklets-fix-install.patch
  gdesklets-0.36.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gDesklets.spec ++++++
--- /var/tmp/diff_new_pack.2VhMPw/_old  2011-06-17 15:21:13.000000000 +0200
+++ /var/tmp/diff_new_pack.2VhMPw/_new  2011-06-17 15:21:13.000000000 +0200
@@ -19,16 +19,17 @@
 
 
 Name:           gDesklets
-Version:        0.36.2
-Release:        2
+%define _name   gdesklets
+Version:        0.36.3
+Release:        1
 Url:            http://www.gdesklets.de
 Group:          System/GUI/GNOME
 License:        GPLv2+
 Summary:        Tiny Displays Sitting on Your Desktop
-Source:         
http://www.pycage.de/download/gdesklets/%{name}-%{version}.tar.bz2
-Patch1:         %name-desktop.patch
-# PATCH-FIX-UPSTREAM gDesklets-0.36.1-am111.patch co...@novell.com -- remove 
duplicates
-Patch3:         gDesklets-0.36.1-am111.patch
+Source:         
http://www.pycage.de/download/gdesklets/%{_name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gDesklets-fix-install.patch vu...@opensuse.org -- Fix 
installation, taken from upstream
+Patch0:         gDesklets-fix-install.patch
+Patch1:         gDesklets-desktop.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  libgtop-devel
@@ -57,21 +58,23 @@
 
 %lang_package
 %prep
-%setup -q
+%setup -q -n %{_name}-%{version}
 translation-update-upstream
-%patch1
-%patch3 -p1
+%patch0 -p0
+%patch1 -p1
 
 %build
+autoreconf -fi
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure
+%configure --disable-static
 make
 
 %install
 %makeinstall
 # Install bash completion script
 install -D -m0644 contrib/bash/gdesklets 
%{buildroot}%{_sysconfdir}/bash_completion.d/gdesklets
-%suse_update_desktop_file gdesklets -r System Applet
+%suse_update_desktop_file -r 
%{buildroot}%{_datadir}/applications/gdesklets.desktop System Applet
+%suse_update_desktop_file 
%{buildroot}%{_sysconfdir}/xdg/autostart/gdesklets.desktop
 # Change sr@Latn to sr@latin
 mv %{buildroot}%{_datadir}/locale/sr@Latn 
%{buildroot}%{_datadir}/locale/sr@latin
 # Move icons in the right icon theme
@@ -109,10 +112,11 @@
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_sysconfdir}/bash_completion.d/gdesklets
+%{_sysconfdir}/xdg/autostart/gdesklets.desktop
 %{_bindir}/gdesklets
 %{_libdir}/gdesklets/
 %doc %{_mandir}/man1/gdesklets.*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/gdesklets.desktop
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_datadir}/mime/packages/gdesklets.xml
 %{_datadir}/pixmaps/gdesklets.png

++++++ gDesklets-desktop.patch ++++++
--- /var/tmp/diff_new_pack.2VhMPw/_old  2011-06-17 15:21:13.000000000 +0200
+++ /var/tmp/diff_new_pack.2VhMPw/_new  2011-06-17 15:21:13.000000000 +0200
@@ -1,22 +1,13 @@
-Index: data/gdesklets.desktop.in
+Index: gdesklets-0.36.3/data/gdesklets.desktop.in
 ===================================================================
---- data/gdesklets.desktop.in.orig
-+++ data/gdesklets.desktop.in
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=gDesklets
--_Comment=A desktop applet system for GNOME
-+_GenericName=A desktop applet system for GNOME
- Exec=gdesklets shell
--Icon=gdesklets.png
-+Icon=gdesklets
- Terminal=false
+--- gdesklets-0.36.3.orig/data/gdesklets.desktop.in
++++ gdesklets-0.36.3/data/gdesklets.desktop.in
+@@ -3,7 +3,7 @@ Name=gDesklets
  Type=Application
+ Encoding=UTF-8
+ Version=1.0
 -MimeType=application/x-gdesklets-display
--Categories=Application;Utility;
 +MimeType=application/x-gdesklets-display;
-+Categories=Utility;DesktopUtility;
- StartupNotify=true
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gDesklets
+ Categories=Utility;
+ X-GNOME-Autostart-enabled=true
+ Exec=gdesklets start

++++++ gDesklets-fix-install.patch ++++++
=== modified file 'Makefile.am'
--- Makefile.am 2010-12-14 10:24:59 +0000
+++ Makefile.am 2011-01-31 01:20:58 +0000
@@ -11,8 +11,12 @@
 autostartdir = $(sysconfdir)/xdg/autostart
 sharedmimepackagedir = $(datadir)/mime/packages
 mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
+pixmapdir = $(datadir)/pixmaps
 basicdeskletsdir = ${installdir}
 
+# initialize this so we can add to it later
+nobase_dist_install_DATA =
+
 include Makefile_gdesklets.am
 include Makefile_python.am
 include Makefile_basicdesklets.am

=== modified file 'Makefile_gdesklets.am'
--- Makefile_gdesklets.am       2011-01-06 11:01:06 +0000
+++ Makefile_gdesklets.am       2011-01-31 01:20:58 +0000
@@ -1,12 +1,14 @@
 # Set the LDFLAGS for this section
 AM_LDFLAGS = -module -avoid-version -as-needed
 
+# Libraries that get installed in these exact subdirectories
 nobase_install_LTLIBRARIES = \
   libdesklets/system/gtop.la \
   utils/svg.la               \
   utils/tiling.la            \
   utils/x11.la
 
+# Scripts that get distributed and installed
 dist_install_SCRIPTS =             \
   ctrlinfo                         \
   gdesklets                        \
@@ -16,38 +18,62 @@
   gdesklets-shell                  \
   test-control.py
 
+# "System" scripts that get distributed but not installed
 dist_noinst_SCRIPTS = autogen.sh
 
+# Man page
 dist_man_MANS = doc/man/gdesklets.1
 
-EXTRA_DIST =             \
-  AUTHORS                \
-  COPYING                \
-  README                 \
-  TODO                   \
-  NEWS                   \
-  contrib/bash/gdesklets
-
+# The .desktop file
+desktop_in_files = data/gdesklets.desktop.in
+# The shared mime XML file
+sharedmimepackage_in_files = data/gdesklets.xml.in
+
+# Other odds and ends that get distributed, but not installed
+# It's up to distro package maintainers to install these
+EXTRA_DIST =                                          \
+  AUTHORS                                             \
+  COPYING                                             \
+  README                                              \
+  TODO                                                \
+  NEWS                                                \
+  contrib/bash/gdesklets                              \
+  $(desktop_in_files)                                 \
+  $(sharedmimepackage_in_files)
+
+# Docs and images that get distributed and installed to these specific
+# directories
+nobase_dist_install_DATA +=                 \
+  doc/basic/gdesklets-doc.xml               \
+  doc/basic/Images/desklet-context-menu.png \
+  doc/basic/Images/desklet-start-shell.png  \
+  doc/basic/Images/gdesklets.png            \
+  doc/basic/Images/open-command.png         \
+  doc/basic/Images/preferences.png          \
+  doc/basic/Images/profile.png              \
+  doc/basic/Images/remote.png               \
+  doc/basic/Images/shell.png                \
+  data/about.png                            \
+  data/gdesklets.png
+
+# Additional files that get cleaned by distclean
 # See http://www.gnu.org/software/hello/manual/automake/Clean.html
 CLEANFILES =   \
   po/.intltool-merge-cache
 
 # The .desktop file
-desktop_in_files = data/gdesklets.desktop.in
-dist_desktop_DATA= $(desktop_in_files)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 # The shared mime XML file
-sharedmimepackage_in_files = data/gdesklets.xml.in
-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
 sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
 # And the mime icon
-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
 
+# Note, this gets installed in both $(pixmapdir) and $(installdir)
 pixmap_DATA = data/gdesklets.png
 
 libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \

=== modified file 'Makefile_python.am'
--- Makefile_python.am  2010-12-14 10:24:59 +0000
+++ Makefile_python.am  2011-01-31 01:20:58 +0000
@@ -1,4 +1,4 @@
-nobase_dist_install_DATA =              \
+nobase_dist_install_DATA +=             \
        Controls/__init__.py    \
        Controls/ArrayBuffer/__init__.py \
        Controls/ArrayBuffer/IArrayBuffer.py \
@@ -48,21 +48,6 @@
        config/DisplayConfigger.py \
        config/StateSaver.py     \
        config/settings.py \
-       data/about.png                               \
-       data/calendar.png                            \
-       data/gdesklets.desktop                       \
-       data/gdesklets.png                           \
-       data/gdesklets.xml                           \
-       data/gnome-mime-application-x-gdesklets-display.png \
-       doc/basic/gdesklets-doc.xml \
-       doc/basic/Images/desklet-context-menu.png       \
-       doc/basic/Images/desklet-start-shell.png                \
-       doc/basic/Images/gdesklets.png                  \
-       doc/basic/Images/open-command.png               \
-       doc/basic/Images/preferences.png                        \
-       doc/basic/Images/profile.png                    \
-       doc/basic/Images/remote.png                     \
-       doc/basic/Images/shell.png \
        display/__init__.py            \
        display/ContainerTarget.py     \
        display/DataTarget.py          \
@@ -212,4 +197,3 @@
        utils/typeconverter.py    \
        utils/vfs.py              \
        utils/xdr.py
-

++++++ gDesklets-0.36.2.tar.bz2 -> gdesklets-0.36.3.tar.bz2 ++++++
++++ 138481 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to