diff --git a/.gitignore b/.gitignore index 25e3383..9881fec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1 @@ -GConf-2.31.6.tar.bz2 -GConf-2.31.7.tar.bz2 -/GConf-2.31.91.tar.bz2 -/GConf-2.32.0.tar.bz2 -/GConf-2.32.1.tar.bz2 -/GConf-2.32.2.tar.bz2 -/GConf-2.32.3.tar.bz2 -/GConf-2.32.4.tar.xz -/GConf-3.1.3.tar.xz -/GConf-3.1.4.tar.xz -/GConf-3.1.6.tar.xz -/GConf-3.1.90.tar.xz -/GConf-3.1.92.tar.xz -/GConf-3.2.3.tar.xz -/GConf-3.2.4.tar.xz -/GConf-3.2.5.tar.xz -/GConf-3.2.6.tar.bz2 +*.tar.* diff --git a/GConf2.spec b/GConf2.spec index e57d831..53ae114 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -6,11 +6,11 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 3.2.6 -Release: 14%{?dist} +Release: 15%{?dist} License: LGPLv2+ and GPLv2+ Group: System Environment/Base #VCS: git:git://git.gnome.org/gconf -Source0: http://download.gnome.org/sources/GConf/3.2/GConf-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/GConf/3.2/GConf-%{version}.tar.xz Source1: macros.gconf2 URL: http://projects.gnome.org/gconf/ @@ -114,7 +114,9 @@ fi %postun -p /sbin/ldconfig %files -f %{name}.lang -%doc COPYING NEWS README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc NEWS README %config(noreplace) %{_sysconfdir}/gconf/2/path %dir %{_sysconfdir}/gconf %dir %{_sysconfdir}/gconf/2 @@ -134,6 +136,7 @@ fi %{_datadir}/sgml/gconf %{_datadir}/GConf %{_mandir}/man1/* +%exclude %{_mandir}/man1/gsettings-schema-convert.1* %dir %{_libdir}/GConf %dir %{_libdir}/GConf/2 %{_rpmconfigdir}/macros.d/macros.gconf2 @@ -142,8 +145,6 @@ fi %{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy %{_datadir}/dbus-1/system-services/org.gnome.GConf.Defaults.service %{_datadir}/dbus-1/services/org.gnome.GConf.service -# Something else should probably own this, but I'm not sure what. -%dir %{_localstatedir}/lib/rpm-state/ %{_localstatedir}/lib/rpm-state/gconf/ %{_libdir}/gio/modules/libgsettingsgconfbackend.so %{_libdir}/girepository-1.0 @@ -156,9 +157,15 @@ fi %{_libdir}/pkgconfig/* %{_datadir}/gir-1.0 %{_bindir}/gsettings-schema-convert -%doc %{_mandir}/man1/gsettings-schema-convert.1* +%{_mandir}/man1/gsettings-schema-convert.1* %changelog +* Sat Jun 27 2015 Ville Skyttä - 3.2.6-15 +- Fix source URL and switch to xz tarball (the only one available) +- Do not own %%{_localstatedir}/lib/rpm-state (#907618) +- Ship gsettings-schema-convert manpage only in -devel (#893767) +- Install COPYING as %%license where available + * Tue Jun 16 2015 Fedora Release Engineering - 3.2.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index f246705..2d7e3d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ba3a7ce519a06d4d4d49fddaa056254 GConf-3.2.6.tar.bz2 +2b16996d0e4b112856ee5c59130e822c GConf-3.2.6.tar.xz