Mailinglist Archive: opensuse-commit (1139 mails)

< Previous Next >
commit gnome-screensaver
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 12 Jan 2007 17:12:12 +0100
  • Message-id: <20070112161212.48D7367817A@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gnome-screensaver
checked in at Fri Jan 12 17:12:12 CET 2007.

--------
--- GNOME/gnome-screensaver/gnome-screensaver.changes 2006-11-30 13:51:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-screensaver/gnome-screensaver.changes 2007-01-12 16:13:00.000000000 +0100
@@ -1,0 +2,16 @@
+Fri Jan 12 16:12:54 CET 2007 - sbrabec@xxxxxxx
+
+- Spec file cleanup.
+
+-------------------------------------------------------------------
+Fri Dec 29 11:41:55 GMT 2006 - james@xxxxxxxxxxxxxxxxx
+
+- Fix %post.
+
+-------------------------------------------------------------------
+Wed Dec 13 17:21:47 CST 2006 - maw@xxxxxxx
+
+- Move to /usr
+- Do some specfile cleanup.
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ gnome-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.S11904/_old 2007-01-12 17:11:49.000000000 +0100
+++ /var/tmp/diff_new_pack.S11904/_new 2007-01-12 17:11:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-screensaver (Version 2.16.1)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -18,18 +18,21 @@
BuildRequires: dbus-1-devel dbus-1-glib
%endif
Version: 2.16.1
-Release: 28
+Release: 39
URL: http://www.gnome.org/
Group: System/GUI/GNOME
License: GNU General Public License (GPL)
Summary: GNOME Screen Saver and Locker
-Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.0/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
Patch: gnome-screensaver-suse-pam.diff
Patch6: gnome-screensaver-unlock-dialog-size.patch
Autoreqprov: on
Requires: /sbin/unix2_chkpwd xscreensaver
+Provides: %{name}-devel = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build

+%gconf_schemas_prereq
+
%description
gnome-screensaver is a screen saver and locker that aims to have
simple, sane, secure defaults and be well integrated with the desktop.
@@ -48,68 +51,78 @@
William Jon McCann <mccann@xxxxxxx>

%prep
-%setup
+%setup -q
%patch
%patch6 -p1

%build
# gnome-common intltool are needed only here
-aclocal
-automake -f -i
-autoconf
-export CFLAGS="$RPM_OPT_FLAGS"
-intltoolize --force
-# NOTE: Set libexecdir the same as xscreensaver.
-./configure\
- --prefix=/opt/gnome\
- --libdir=/opt/gnome/%_lib\
- --libexecdir=/opt/gnome/lib/%{name}\
- --sysconfdir=/etc/opt/gnome\
- --with-gdm-config=/etc/opt/gnome/gdm/gdm.conf\
+#aclocal
+#automake -f -i
+#autoconf
+#export CFLAGS="$RPM_OPT_FLAGS"
+#intltoolize --force
+autoreconf -f -i
+# needed for gnome-screensaver-2.16.1:
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+# FIXME: Maybe libexecdir the same as xscreensaver.
+%configure\
+ --libexecdir=%{_prefix}/lib/%{name}\
--with-pam-prefix=/etc\
--enable-authentication-scheme=helper\
--with-passwd-helper="/sbin/unix2_chkpwd"\
--with-xscreensaverdir=/etc/xscreensaver
-make
+make %{?jobs:-j%jobs}

%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
make DESTDIR=$RPM_BUILD_ROOT install
%suse_update_desktop_file gnome-screensaver-preferences GNOME Screensaver X-SuSE-ControlCenter-LookAndFeel
-%find_lang %{name}
sh data/migrate-xscreensaver-config.sh /etc/xscreensaver/*.xml
rm bsod.desktop barcode.desktop blitspin.desktop bouncingcow.desktop decayscreen.desktop distort.desktop flipscreen3d.desktop fliptext.desktop glsnake.desktop jigsaw.desktop mirrorblob.desktop popsquares.desktop rotzoomer.desktop slidescreen.desktop sonar.desktop twang.desktop xanalogtv.desktop xflame.desktop xjack.desktop
-mv *.desktop $RPM_BUILD_ROOT/opt/gnome/share/applications/screensavers
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/screensavers
+mv *.desktop $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
+%find_lang %{name}
+%find_gconf_schemas
+cat %{name}.lang %{name}.schemas_list >%{name}.lst

%clean
rm -rf $RPM_BUILD_ROOT

-%post
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/gnome-screensaver.schemas >/dev/null
+%pre -f %{name}.schemas_pre
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun

-%files -f %{name}.lang
+%files -f %{name}.lst
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog HACKING NEWS README TODO
%config /etc/pam.d/gnome-screensaver
-/etc/opt/gnome/gconf/schemas/gnome-screensaver.schemas
-/etc/opt/gnome/xdg/menus/gnome-screensavers.menu
-%dir /etc/opt/gnome/xdg
-%dir /etc/opt/gnome/xdg/menus
-/opt/gnome/bin/*
-/opt/gnome/lib/%{name}
-/opt/gnome/%_lib/pkgconfig/gnome-screensaver.pc
-/opt/gnome/share/applications/*.desktop
-%dir /opt/gnome/share/applications/screensavers
-/opt/gnome/share/applications/screensavers/*.desktop
-/opt/gnome/share/desktop-directories/gnome-screensaver.directory
-%dir /opt/gnome/share/pixmaps/backgrounds
-/opt/gnome/share/pixmaps/backgrounds/*
-/opt/gnome/share/gnome-screensaver
-/opt/gnome/share/pixmaps/gnome-logo-white.svg
+%{_sysconfdir}/xdg/menus/gnome-screensavers.menu
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/applications/screensavers/*.desktop
+%{_datadir}/desktop-directories/gnome-screensaver.directory
+%{_datadir}/pixmaps/backgrounds/*
+%{_datadir}/gnome-screensaver
+%{_datadir}/pixmaps/gnome-logo-white.svg
+%{_libdir}/pkgconfig/gnome-screensaver.pc
+%{_prefix}/lib/%{name}
+# FIXME: Directory ownership:
+%dir %{_datadir}/applications/screensavers
+# FIXME: Maybe bad directory ownership:
+%dir %{_datadir}/pixmaps/backgrounds
+# FIXME: Directory ownership:
+#%dir %{_sysconfdir}/xdg/menus

%changelog -n gnome-screensaver
+* Fri Jan 12 2007 - sbrabec@xxxxxxx
+- Spec file cleanup.
+* Fri Dec 29 2006 - james@xxxxxxxxxxxxxxxxx
+- Fix %%post.
+* Wed Dec 13 2006 - maw@xxxxxxx
+- Move to /usr
+- Do some specfile cleanup.
* Thu Nov 30 2006 - sbrabec@xxxxxxx
- Build correctly in older products.
* Thu Nov 09 2006 - rodrigo@xxxxxxx


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages