Hello community, here is the log from the commit of package xfconf for openSUSE:Factory checked in at 2012-04-17 22:03:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfconf (Old) and /work/SRC/openSUSE:Factory/.xfconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfconf", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfconf/xfconf.changes 2011-12-27 18:39:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfconf.new/xfconf.changes 2012-04-17 22:04:39.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 29 20:55:58 UTC 2012 - [email protected] + +- corrected dependencies +- split of -lang subpackage +- specfile cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfconf.spec ++++++ --- /var/tmp/diff_new_pack.etoDwS/_old 2012-04-17 22:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.etoDwS/_new 2012-04-17 22:04:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfconf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%define libname libxfconf-0-2 + Name: xfconf Version: 4.8.1 Release: 0 -%define libname lib%{name}-0-2 Summary: Simple Configuration Storage for Xfce License: GPL-2.0+ Group: System/GUI/XFCE -Url: http://www.xfce.org/ -Source: %{name}-%{version}.tar.bz2 +Url: http://www.xfce.org/projects#core +Source: http://archive.xfce.org/src/xfce/xfconf/4.8/%{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE xfconf-remove-rpath.patch [email protected] -- Do not set RPATH for Xfconf.so Patch0: xfconf-4.7.3-remove-rpath.patch BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: perl(ExtUtils::Depends) BuildRequires: perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib) +BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,49 +45,50 @@ Xfce desktop. %package -n perl-xfconf -Summary: Simple Configuration Storage for Xfce - Perl Interface +Summary: Perl Interface to xfconf Group: Development/Libraries/Perl Requires: %{name} = %{version} Requires: perl = %{perl_version} Requires: perl(Glib) +Recommends: %{name}-lang = %{version} %description -n perl-xfconf -Xfconf is a simple client-server configuration storage and query system for the -Xfce desktop. - This package contains the Perl interface to %{name}. %package -n %{libname} - -Summary: Simple Configuration Storage for Xfce - Runtime Library +Summary: xfconf Shared Library Group: System/Libraries Provides: libxfce4mcs = %{version} Obsoletes: libxfce4mcs < %{version} Recommends: %{name} = %{version} %description -n %{libname} -Xfconf is a simple client-server configuration storage and query system for the -Xfce desktop. - -This package contains the runtime library. +This package contains the xfconf shared library. %package -n libxfconf-devel -Summary: Simple Configuration Storage for Xfce - Runtime Library - Development Files +Summary: Development Files for xfconf Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} -Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(libxfce4util-1.0) Provides: libxfce4mcs-devel = %{version} Obsoletes: libxfce4mcs-devel < %{version} Provides: xfce-mcs-manager-devel = %{version} Obsoletes: xfce-mcs-manager-devel < %{version} %description -n libxfconf-devel -Xfconf is a simple client-server configuration storage and query system for the -Xfce desktop. +This package contains the files needed for developing applications using +xfconf. + +# this should be replaced by %%lang_package once bnc#513786 is resolved +%package lang +Summary: Languages for package %{name} +Group: System/Localization +Requires: %{libname} = %{version} +Provides: %{name}-lang-all = %{version} +Supplements: packageand(bundle-lang-other:%{libname}) +BuildArch: noarch -This package contains files mandatory for development. +%description lang +Provides translations to the package %{name} %prep %setup -q @@ -91,20 +96,23 @@ %build %configure \ - --disable-silent-rules \ --disable-static \ --with-helper-path-prefix=%{_libexecdir} \ --with-perl-options='NOECHO= OPTIMIZE="%{optflags}" CCDLFLAGS="-Wl,-E" INSTALLDIRS=vendor' \ --enable-gtk-doc -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install -rm -f %{buildroot}%{_libdir}/*.la -rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK} -rm -f %{buildroot}%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs + +rm -f %{buildroot}%{_libdir}/*.la \ + %{buildroot}%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs + %perl_process_packlist -%find_lang %{name} + +rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK} + +%find_lang %{name} %{?no_lang_C} %clean rm -rf %{buildroot} @@ -113,25 +121,30 @@ %postun -n %{libname} -p /sbin/ldconfig -%files -f %{name}.lang +%files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog TODO %{_bindir}/xfconf-query %dir %{_libexecdir}/xfce4 %dir %{_libexecdir}/xfce4/xfconf %{_libexecdir}/xfce4/xfconf/xfconfd -%{_datadir}/dbus-1/services/* +%{_datadir}/dbus-1/services/org.xfce.Xfconf.service %files -n %{libname} %defattr(-,root,root) -%{_libdir}/*.so.* +%doc COPYING +%{_libdir}/libxfconf-*.so.* + +%files lang -f %{name}.lang %files -n libxfconf-devel %defattr(-,root,root) +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html %doc %{_datadir}/gtk-doc/html/xfconf -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/* +%{_includedir}/xfce4 +%{_libdir}/libxfconf-*.so +%{_libdir}/pkgconfig/libxfconf-*.pc %files -n perl-xfconf %defattr(-,root,root) @@ -142,8 +155,5 @@ %dir %{perl_vendorarch}/auto %dir %{perl_vendorarch}/auto/Xfce4 %{perl_vendorarch}/auto/Xfce4/Xfconf -%if 0%{?suse_version} < 1140 -%{_localstatedir}/adm/perl-modules/xfconf -%endif %changelog ++++++ xfconf-4.7.3-remove-rpath.patch ++++++ --- /var/tmp/diff_new_pack.etoDwS/_old 2012-04-17 22:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.etoDwS/_new 2012-04-17 22:04:40.000000000 +0200 @@ -5,7 +5,7 @@ @@ -98,6 +98,18 @@ WriteMakefile( $xfconf->get_makefile_vars, ); - + +rename "Makefile.perl", "Makefile.perl.orig" + or die "Cannot rename: $!"; +open IN, "<Makefile.perl.orig" @@ -18,6 +18,6 @@ +} +close IN; +close OUT; - + sub MY::postamble { ++++++ xfconf-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.etoDwS/_old 2012-04-17 22:04:40.000000000 +0200 +++ /var/tmp/diff_new_pack.etoDwS/_new 2012-04-17 22:04:40.000000000 +0200 @@ -1,3 +1,3 @@ -addFilter("no-dependency-on libxfconf.*") +# these headers belong here addFilter("devel-file-in-non-devel-package .*/usr/lib/perl5/vendor_perl/.*\.h") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
