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

Sun Jul 10 08:20:05 CEST 2011

I'm agree with ahmad: +1
+-----Original Message-----
+From: Ahmad Samir <ahmadsamir3891 at gmail.com>
+Sender: mageia-dev-bounces at mageia.org
+Date: Sun, 10 Jul 2011 05:55:37 
+To: <mageia-dev at mageia.org>
+Reply-To: Mageia development mailing-list <mageia-dev at mageia.org>
+Subject: Re: [Mageia-dev] [101505] Revert rpm5 stuffs and sync with fedora
+
+On 7 June 2011 15:34,  <root at 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
+> +%doc %{_datadir}/gtk-doc/html/gtk3
+> +%{_bindir}/gtk3-demo
+> +%{_datadir}/aclocal/*
+> +%{_datadir}/gtk-%{api_version}
+> +%{_includedir}/gtk-%{api_version}
+> +%{_libdir}/libgtk-%{api}.so
+> +%{_libdir}/libgtk-%{api}.la
+> +%{_libdir}/libgdk-%{api}.so
+> +%{_libdir}/libgdk-%{api}.la
+> +%{_libdir}/pkgconfig/gdk-*%{api_version}.pc
+> +%{_libdir}/pkgconfig/gtk+-*%{api_version}.pc
+> +%_datadir/gir-1.0/Gdk-%{api_version}.gir
+> +%_datadir/gir-1.0/GdkX11-%{api_version}.gir
+> +%_datadir/gir-1.0/Gtk-%{api_version}.gir
+> +
+> +#--------------------------------------------------------------------
+> +
+>  %package -n %{gail_libname}
+>  Summary:	GNOME Accessibility Implementation Library
+>  Group:		System/Libraries
+> @@ -141,6 +222,14 @@
+>  %description -n %{gail_libname}
+>  Gail is the GNOME Accessibility Implementation Library
+>
+> +%files -n %gail_libname
+> +%defattr(-,root,root)
+> +%{_libdir}/libgailutil-%{api}.so.%{gail_major}*
+> +%{_libdir}/gtk-%{api_version}/modules/libferret.so
+> +%{_libdir}/gtk-%{api_version}/modules/libgail.so
+> +
+> +#--------------------------------------------------------------------
+> +
+>  %package -n %gaildevelname
+>  Summary:	Static libraries, include files for GAIL
+>  Group:		Development/GNOME and GTK+
+> @@ -150,21 +239,37 @@
+>  %description -n %gaildevelname
+>  Gail is the GNOME Accessibility Implementation Library
+>
+> +%files -n %gaildevelname
+> +%defattr(-,root,root)
+> +%{_datadir}/gtk-doc/html/gail-libgail-util3
+> +%{_libdir}/libgailutil-%{api}.so
+> +%{_libdir}/libgailutil-%{api}.la
+> +%{_includedir}/gail-%{api_version}
+> +%{_libdir}/pkgconfig/gail-%{api_version}.pc
+> +
+> +#--------------------------------------------------------------------
+> +
+>  %prep
+>  %setup -qn %{pkgname}-%{version}
+>  %apply_patches
+>
+>  %build
+> -%ifarch ppc64
+> -export CFLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+> -%endif
+>
+> -# fix crash in nautilus (GNOME bug #596977)
+> -export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-fomit-frame-pointer//g'`
+> +(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh;
+> CONFIGFLAGS=--enable-gtk-doc; fi;
+> + %configure $CONFIGFLAGS \
+> +        --enable-gtk2-dependency \
+> +        --enable-xkb \
+> +        --enable-xinerama \
+> +        --enable-xinput \
+> +        --enable-xrandr \
+> +        --enable-xfixes \
+> +        --enable-xcomposite \
+> +        --enable-xdamage \
+> +        --enable-x11-backend \
+> +)
+>
+> -export CPPFLAGS="-DGTK_COMPILATION"
+> -%configure2_5x --enable-xinerama \
+> -	--enable-gtk2-dependency
+> +# fight unused direct deps
+> +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+>
+>  %make
+>
+> @@ -185,12 +290,12 @@
+>  touch
+> $RPM_BUILD_ROOT%_libdir/gtk-%{api_version}/%{binary_version}/immodules.cache
+>  mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-%{api_version}/modules
+>
+> -%if %_lib != lib
+> - mv %{buildroot}%{_bindir}/gtk-query-immodules-%{api_version}
+> %{buildroot}%{_bindir}/gtk-query-immodules-%{api_version}-64
+> -%else
+> - mv %{buildroot}%{_bindir}/gtk-query-immodules-%{api_version}
+> %{buildroot}%{_bindir}/gtk-query-immodules-%{api_version}-32
+> -%endif
+> +(cd $RPM_BUILD_ROOT%{_bindir}
+> + mv gtk-query-immodules-3.0 gtk-query-immodules-3.0-%{__isa_bits}
+> +)
+>
+> +# Input method frameworks want this
+> +install -D %{SOURCE1}
+> $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
+>  %{find_lang} gtk30 gtk30 gtk30-properties
+>
+>  #remove not packaged files
+> @@ -204,90 +309,3 @@
+>  %clean
+>  rm -rf $RPM_BUILD_ROOT
+>
+> -%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
+> -%if %_lib != lib
+> - %{_bindir}/gtk-query-immodules-%{api_version}-64 --update-cache
+> -%else
+> - %{_bindir}/gtk-query-immodules-%{api_version}-32 --update-cache
+> -%endif
+> -
+> -%triggerin -n %{libname} --
+> %{_libdir}/gtk-%{api_version}/%{binary_version}/immodules/*.so
+> -%if %_lib != lib
+> - %{_bindir}/gtk-query-immodules-%{api_version}-64 --update-cache
+> -%else
+> - %{_bindir}/gtk-query-immodules-%{api_version}-32 --update-cache
+> -%endif
+> -
+> -%triggerpostun -n %{libname} --
+> %{_libdir}/gtk-%{api_version}/%{binary_version}/immodules/*.so
+> -%if %_lib != lib
+> - %{_bindir}/gtk-query-immodules-%{api_version}-64 --update-cache
+> -%else
+> - %{_bindir}/gtk-query-immodules-%{api_version}-32 --update-cache
+> -%endif
+> -
+> -%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
+> -
+> -%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
+> -
+> -%files -n %{develname}
+> -%defattr(-, root, root)
+> -%doc docs/*.txt AUTHORS ChangeLog NEWS* README*
+> -%doc %{_datadir}/gtk-doc/html/gdk3
+> -%doc %{_datadir}/gtk-doc/html/gtk3
+> -%{_bindir}/gtk3-demo
+> -%{_datadir}/aclocal/*
+> -%{_datadir}/gtk-%{api_version}
+> -%{_includedir}/gtk-%{api_version}
+> -%{_libdir}/libgtk-%{api}.so
+> -%{_libdir}/libgtk-%{api}.la
+> -%{_libdir}/libgdk-%{api}.so
+> -%{_libdir}/libgdk-%{api}.la
+> -%{_libdir}/pkgconfig/gdk-*%{api_version}.pc
+> -%{_libdir}/pkgconfig/gtk+-*%{api_version}.pc
+> -%_datadir/gir-1.0/Gdk-%{api_version}.gir
+> -%_datadir/gir-1.0/GdkX11-%{api_version}.gir
+> -%_datadir/gir-1.0/Gtk-%{api_version}.gir
+> -
+> -%files -n %gail_libname
+> -%defattr(-,root,root)
+> -%{_libdir}/libgailutil-%{api}.so.%{gail_major}*
+> -%{_libdir}/gtk-%{api_version}/modules/libferret.so
+> -%{_libdir}/gtk-%{api_version}/modules/libgail.so
+> -
+> -%files -n %gaildevelname
+> -%defattr(-,root,root)
+> -%{_datadir}/gtk-doc/html/gail-libgail-util3
+> -%{_libdir}/libgailutil-%{api}.so
+> -%{_libdir}/libgailutil-%{api}.la
+> -%{_includedir}/gail-%{api_version}
+> -%{_libdir}/pkgconfig/gail-%{api_version}.pc
+>
+>
+
+
+
+-- 
+Ahmad Samir
+