- remove workarounds for 11.2

- update to version 4.8.1
  - fix double free crash
  - allow installation of the helpers in a custom location
  - translation updates
- install xfconfd under %_libexecdir

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfconf?expand=0&rev=35

xfconf.spec

@@ -15,31 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-%if 0%{?suse_version} >= 1130
-%define withperl 1
-%else
-%define withperl 0
-%endif
-
 Name:           xfconf
-Version:        4.8.0
-Release:        2
-License:        GPLv2+
+Version:        4.8.1
+Release:        0
 %define libname lib%{name}-0-2
 Summary:        Simple Configuration Storage for Xfce
-Url:            http://www.xfce.org/
+License:        GPL-2.0+
 Group:          System/GUI/XFCE
+Url:            http://www.xfce.org/
 Source:         %{name}-%{version}.tar.bz2
 Source100:      %{name}-rpmlintrc
 Patch0:         xfconf-4.7.3-remove-rpath.patch
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
-%if %{withperl}
 BuildRequires:  perl(ExtUtils::Depends)
 BuildRequires:  perl(ExtUtils::PkgConfig)
 BuildRequires:  perl(Glib)
-%endif
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libxfce4util-1.0)
@@ -49,10 +40,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Xfconf is a simple client-server configuration storage and query system for the
 Xfce desktop.
 
-%if %{withperl}
-
 %package -n perl-xfconf
-License:        GPLv2+
 Summary:        Simple Configuration Storage for Xfce - Perl Interface
 Group:          Development/Libraries/Perl
 Requires:       %{name} = %{version}
@@ -65,12 +53,8 @@ Xfce desktop.
 
 This package contains the Perl interface to %{name}.
 
-%endif
-
 %package -n %{libname}
 
-
-License:        GPLv2+
 Summary:        Simple Configuration Storage for Xfce - Runtime Library
 Group:          System/Libraries
 Provides:       libxfce4mcs = %{version}
@@ -84,7 +68,6 @@ Xfce desktop.
 This package contains the runtime library.
 
 %package -n libxfconf-devel
-License:        GPLv2+
 Summary:        Simple Configuration Storage for Xfce - Runtime Library - Development Files
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
@@ -110,11 +93,8 @@ This package contains files mandatory for development.
 %configure \
     --disable-silent-rules \
     --disable-static \
-%if %{withperl}
+    --with-helper-path-prefix=%{_libexecdir} \
     --with-perl-options='NOECHO= OPTIMIZE="%{optflags}" CCDLFLAGS="-Wl,-E" INSTALLDIRS=vendor' \
-%else
-    --disable-perl-bindings \
-%endif
     --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -123,9 +103,7 @@ make %{?_smp_mflags}
 rm -f %{buildroot}%{_libdir}/*.la
 rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK}
 rm -f %{buildroot}%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs
-%if %{withperl}
 %perl_process_packlist
-%endif
 %find_lang %{name}
 
 %clean
@@ -139,9 +117,9 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog TODO
 %{_bindir}/xfconf-query
-%dir %{_libdir}/xfce4
-%dir %{_libdir}/xfce4/xfconf
-%{_libdir}/xfce4/xfconf/xfconfd
+%dir %{_libexecdir}/xfce4
+%dir %{_libexecdir}/xfce4/xfconf
+%{_libexecdir}/xfce4/xfconf/xfconfd
 %{_datadir}/dbus-1/services/*
 
 %files -n %{libname}
@@ -155,8 +133,6 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
-%if %{withperl}
-
 %files -n perl-xfconf
 %defattr(-,root,root)
 %doc %{_mandir}/man3/Xfce4::Xfconf.3pm*
@@ -170,6 +146,4 @@ rm -rf %{buildroot}
 %{_localstatedir}/adm/perl-modules/xfconf
 %endif
 
-%endif
-
 %changelog