Re: [Mageia-dev] [101505] Revert rpm5 stuffs and sync with fedora

2011-07-10 Thread cazzaniga . sandro 
I'm agree with ahmad: +1
-Original Message-
From: Ahmad Samir ahmadsamir3...@gmail.com
Sender: mageia-dev-boun...@mageia.org
Date: Sun, 10 Jul 2011 05:55:37 
To: mageia-dev@mageia.org
Reply-To: Mageia development mailing-list mageia-dev@mageia.org
Subject: Re: [Mageia-dev] [101505] Revert rpm5 stuffs and sync with fedora

On 7 June 2011 15:34,  r...@mageia.org wrote:
 Revision 101505 Author dmorgan Date 2011-06-07 15:34:09 +0200 (Tue, 07 Jun
 2011)

 Log Message

 Revert rpm5 stuffs and sync with fedora

 Modified Paths

 cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec

 Modified: cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec
 ===
 --- cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec   2011-06-07 13:34:06 UTC 
 (rev
 101504)
 +++ cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec   2011-06-07 13:34:09 UTC 
 (rev
 101505)
 @@ -6,7 +6,7 @@
  # enable_bootstrap: Toggle if bootstrapping package
  #  0 = no
  #  1 = yes
 -%define enable_bootstrap 0
 +%define enable_bootstrap 1

  # enable_tests: Run test suite in build
  #  0 = no
 @@ -43,12 +43,16 @@

  Summary: The GIMP ToolKit (GTK+), a library for creating GUIs
  Name:%{pkgname}%{api_version}
 -Version: 3.0.9
 +Version: 3.0.11
  Release:%mkrel 1
  License: LGPLv2+
  Group:   System/Libraries
 -Source0: 
 http://ftp.gnome.org/pub/GNOME/sources/%pkgname/%{pkgname}-%{version}.tar.bz2
 -BuildRoot:   %{_tmppath}/%{name}-%{version}-buildroot
 +Source0: 
 http://ftp.gnome.org/pub/GNOME/sources/%pkgname/%{pkgname}-%{version}.tar.xz
 +Source1:im-cedilla.conf
 +%if !%{enable_bootstrap}
 +# use oxygen gtk3 theme by default if available
 +Patch12:gtk+-defaulttheme.patch
 +%endif
  URL: http://www.gtk.org
  Requires:common-licenses
  BuildRequires:   gettext-devel
 @@ -82,6 +86,7 @@
  BuildRequires: fonts-ttf-dejavu
  %if !%{enable_bootstrap}
  Suggests: xdg-user-dirs-gtk
 +Suggests: oxygen-gtk3


Since oxygen-gtk3 is only useful for KDE users, it should be suggested
by a KDE package, not in gtk+3.0, IMHO.

(The same for gtk+2.0 suggesting oxygen-gtk).


  %endif
  Requires: %{libname} = %{version}
  Obsoletes:   gtk-engines3  3.0.0
 @@ -96,6 +101,30 @@
  If you are planning on using the GIMP or another program that uses GTK+,
  you'll need to have the gtk+ package installed.

 +%post
 +gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 +glib-compile-schemas %{_datadir}/glib-2.0/schemas  /dev/null || :
 +
 +if [ -d %{_datadir}/icons ]; then
 +for i in `/bin/ls %{_datadir}/icons` ; do
 +[ -d %{_datadir}/icons/$i -a -e
 %{_datadir}/icons/$i/icon-theme.cache -a -e
 %{_datadir}/icons/$i/index.theme ]  gtk-update-icon-cache-%{api_version}
 --force --quiet %{_datadir}/icons/$i
 +done
 +exit 0
 +fi
 +
 +
 +%files -f gtk30.lang
 +%defattr(-, root, root)
 +%doc README
 +%_mandir/man1/gtk-query-immodules-%{api_version}.1*
 +%{_datadir}/themes
 +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 +%dir %{_sysconfdir}/gtk-%{api_version}
 +%config(noreplace) %{_sysconfdir}/gtk-%{api_version}/im-multipress.conf
 +%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 +
 +#
 +
  %package -n %{libname}
  Summary: %{summary}
  Group:%{group}
 @@ -112,6 +141,37 @@
  This package contains the library needed to run programs dynamically
  linked with gtk+.

 +%post -n %{libname}
 +if [ $1 = 2 ]; then
 +if [ -f %{_sysconfdir}/gtk-%{api_version}/gtk.immodules ]; then
 +rm -f %{_sysconfdir}/gtk-%{api_version}/gtk.immodules
 +fi
 +fi
 +gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 +%{_libdir}/gtk-%{api_version}/bin/gtk-query-immodules-%{api_version} 
 %_libdir/gtk-%{api_version}/3.0.0/immodules.cache
 +
 +%files -n %{libname}
 +%defattr(-, root, root)
 +%doc README
 +%{_bindir}/gtk-query-immodules-%{api_version}-*
 +%ghost %verify (not md5 mtime size)
 %_libdir/gtk-%{api_version}/3.0.0/immodules.cache
 +%dir %{_libdir}/gtk-%{api_version}
 +%dir %{_libdir}/gtk-%{api_version}/modules
 +%dir %{_libdir}/gtk-%{api_version}/%{binary_version}
 +%dir %{_libdir}/gtk-%{api_version}/%{binary_version}/immodules
 +%{_libdir}/gtk-%{api_version}/%{binary_version}/immodules/*.so
 +%dir %{_libdir}/gtk-%{api_version}/%{binary_version}/printbackends
 +%{_libdir}/gtk-%{api_version}/%{binary_version}/printbackends/*.so
 +%{_libdir}/libgtk-3.so.%{lib_major}
 +%{_libdir}/libgtk-3.so.%{lib_major}.*
 +%{_libdir}/libgdk-3.so.%{lib_major}
 +%{_libdir}/libgdk-3.so.%{lib_major}.*
 +%_libdir/girepository-1.0/Gdk-%{api_version}.typelib
 +%_libdir/girepository-1.0/GdkX11-%{api_version}.typelib
 +%_libdir/girepository-1.0/Gtk-%{api_version}.typelib
 +
 +#
 +
  %package -n %{develname}
  Summary: Development files for GTK+ (GIMP

Re: [Mageia-dev] [101505] Revert rpm5 stuffs and sync with fedora

2011-07-10 Thread John Balcaen 
2011/7/10  cazzaniga.san...@gmail.com:
 I'm agree with ahmad: +1

 Since oxygen-gtk3 is only useful for KDE users, it should be suggested
 by a KDE package, not in gtk+3.0, IMHO.

 (The same for gtk+2.0 suggesting oxygen-gtk).

I guess it's not directly related to kde but rather to provide the
same theme for xfce/gnome/kde aka oxygen while waiting for a decision
of the artwork team (i guess no one want to port iaora to gtk3)



-- 
Balcaen John
Jabber-id: mik...@jabber.littleboboy.net

Re: [Mageia-dev] [101505] Revert rpm5 stuffs and sync with fedora

2011-07-10 Thread Ahmad Samir 
On 10 July 2011 11:36, John Balcaen mik...@mageia.org wrote:
 2011/7/10  cazzaniga.san...@gmail.com:
 I'm agree with ahmad: +1

 Since oxygen-gtk3 is only useful for KDE users, it should be suggested
 by a KDE package, not in gtk+3.0, IMHO.

 (The same for gtk+2.0 suggesting oxygen-gtk).

 I guess it's not directly related to kde but rather to provide the
 same theme for xfce/gnome/kde aka oxygen while waiting for a decision
 of the artwork team (i guess no one want to port iaora to gtk3)


Right; but if Ia_Ora doesn't get ported to GTK+3.0 then we should
stick with the upstream default, which is Adwaita. Less maintenance
costs, less downstream bugs for us...

(Oxygen looks good on Dolphin, but a bit quirky on Firefox, whereas
Clearlooks/Nodoka look good on Firefox, but not-so-hot on Dolphin).



 --
 Balcaen John
 Jabber-id: mik...@jabber.littleboboy.net




-- 
Ahmad Samir

Re: [Mageia-dev] [101505] Revert rpm5 stuffs and sync with fedora

2011-07-09 Thread Ahmad Samir 
On 7 June 2011 15:34,  r...@mageia.org wrote:
 Revision 101505 Author dmorgan Date 2011-06-07 15:34:09 +0200 (Tue, 07 Jun
 2011)

 Log Message

 Revert rpm5 stuffs and sync with fedora

 Modified Paths

 cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec

 Modified: cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec
 ===
 --- cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec   2011-06-07 13:34:06 UTC 
 (rev
 101504)
 +++ cauldron/gtk+3.0/current/SPECS/gtk+3.0.spec   2011-06-07 13:34:09 UTC 
 (rev
 101505)
 @@ -6,7 +6,7 @@
  # enable_bootstrap: Toggle if bootstrapping package
  #  0 = no
  #  1 = yes
 -%define enable_bootstrap 0
 +%define enable_bootstrap 1

  # enable_tests: Run test suite in build
  #  0 = no
 @@ -43,12 +43,16 @@

  Summary: The GIMP ToolKit (GTK+), a library for creating GUIs
  Name:%{pkgname}%{api_version}
 -Version: 3.0.9
 +Version: 3.0.11
  Release:%mkrel 1
  License: LGPLv2+
  Group:   System/Libraries
 -Source0: 
 http://ftp.gnome.org/pub/GNOME/sources/%pkgname/%{pkgname}-%{version}.tar.bz2
 -BuildRoot:   %{_tmppath}/%{name}-%{version}-buildroot
 +Source0: 
 http://ftp.gnome.org/pub/GNOME/sources/%pkgname/%{pkgname}-%{version}.tar.xz
 +Source1:im-cedilla.conf
 +%if !%{enable_bootstrap}
 +# use oxygen gtk3 theme by default if available
 +Patch12:gtk+-defaulttheme.patch
 +%endif
  URL: http://www.gtk.org
  Requires:common-licenses
  BuildRequires:   gettext-devel
 @@ -82,6 +86,7 @@
  BuildRequires: fonts-ttf-dejavu
  %if !%{enable_bootstrap}
  Suggests: xdg-user-dirs-gtk
 +Suggests: oxygen-gtk3


Since oxygen-gtk3 is only useful for KDE users, it should be suggested
by a KDE package, not in gtk+3.0, IMHO.

(The same for gtk+2.0 suggesting oxygen-gtk).


  %endif
  Requires: %{libname} = %{version}
  Obsoletes:   gtk-engines3  3.0.0
 @@ -96,6 +101,30 @@
  If you are planning on using the GIMP or another program that uses GTK+,
  you'll need to have the gtk+ package installed.

 +%post
 +gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 +glib-compile-schemas %{_datadir}/glib-2.0/schemas  /dev/null || :
 +
 +if [ -d %{_datadir}/icons ]; then
 +for i in `/bin/ls %{_datadir}/icons` ; do
 +[ -d %{_datadir}/icons/$i -a -e
 %{_datadir}/icons/$i/icon-theme.cache -a -e
 %{_datadir}/icons/$i/index.theme ]  gtk-update-icon-cache-%{api_version}
 --force --quiet %{_datadir}/icons/$i
 +done
 +exit 0
 +fi
 +
 +
 +%files -f gtk30.lang
 +%defattr(-, root, root)
 +%doc README
 +%_mandir/man1/gtk-query-immodules-%{api_version}.1*
 +%{_datadir}/themes
 +%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 +%dir %{_sysconfdir}/gtk-%{api_version}
 +%config(noreplace) %{_sysconfdir}/gtk-%{api_version}/im-multipress.conf
 +%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 +
 +#
 +
  %package -n %{libname}
  Summary: %{summary}
  Group:%{group}
 @@ -112,6 +141,37 @@
  This package contains the library needed to run programs dynamically
  linked with gtk+.

 +%post -n %{libname}
 +if [ $1 = 2 ]; then
 +if [ -f %{_sysconfdir}/gtk-%{api_version}/gtk.immodules ]; then
 +rm -f %{_sysconfdir}/gtk-%{api_version}/gtk.immodules
 +fi
 +fi
 +gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 +%{_libdir}/gtk-%{api_version}/bin/gtk-query-immodules-%{api_version} 
 %_libdir/gtk-%{api_version}/3.0.0/immodules.cache
 +
 +%files -n %{libname}
 +%defattr(-, root, root)
 +%doc README
 +%{_bindir}/gtk-query-immodules-%{api_version}-*
 +%ghost %verify (not md5 mtime size)
 %_libdir/gtk-%{api_version}/3.0.0/immodules.cache
 +%dir %{_libdir}/gtk-%{api_version}
 +%dir %{_libdir}/gtk-%{api_version}/modules
 +%dir %{_libdir}/gtk-%{api_version}/%{binary_version}
 +%dir %{_libdir}/gtk-%{api_version}/%{binary_version}/immodules
 +%{_libdir}/gtk-%{api_version}/%{binary_version}/immodules/*.so
 +%dir %{_libdir}/gtk-%{api_version}/%{binary_version}/printbackends
 +%{_libdir}/gtk-%{api_version}/%{binary_version}/printbackends/*.so
 +%{_libdir}/libgtk-3.so.%{lib_major}
 +%{_libdir}/libgtk-3.so.%{lib_major}.*
 +%{_libdir}/libgdk-3.so.%{lib_major}
 +%{_libdir}/libgdk-3.so.%{lib_major}.*
 +%_libdir/girepository-1.0/Gdk-%{api_version}.typelib
 +%_libdir/girepository-1.0/GdkX11-%{api_version}.typelib
 +%_libdir/girepository-1.0/Gtk-%{api_version}.typelib
 +
 +#
 +
  %package -n %{develname}
  Summary: Development files for GTK+ (GIMP ToolKit) applications
  Group:   Development/GNOME and GTK+
 @@ -132,6 +192,27 @@
  for writing GTK+ widgets and using GTK+ widgets in applications), and GTK+
  (the widget set).

 +%files -n %{develname}
 +%defattr(-, root, root)
 +%doc docs/*.txt AUTHORS ChangeLog NEWS* README*
 +%doc %{_datadir}/gtk-doc/html/gdk3