SHA256
1
0
forked from pool/xfconf

Accepting request 98071 from X11:xfce

- 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/request/show/98071
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfconf?expand=0&rev=21
This commit is contained in:
Stephan Kulow
2011-12-27 17:39:45 +00:00
committed by Git OBS Bridge
parent 6f0bc1b7dc
commit 390bcba792
4 changed files with 21 additions and 37 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e071d55982238f997a691ff4bb08ef39e4c86bae31cf69b6666bc0cdadd1b85d
size 489324

3
xfconf-4.8.1.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9860737539fab2b852e8c07c50c205a5fbe894b08bcb4488a70e3fd6c75993cb
size 501216

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Dec 23 19:49:00 UTC 2011 - gber@opensuse.org
- 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
-------------------------------------------------------------------
Mon Jan 17 10:38:52 UTC 2011 - gber@opensuse.org

View File

@@ -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: 1
License: GPL-2.0+
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: GPL-2.0+
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: GPL-2.0+
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: GPL-2.0+
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