diff --git a/.gitignore b/.gitignore index 9b4c3ea..9ba70fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gtkhash-0.3.0.tar.gz /gtkhash-0.4.0.tar.gz /gtkhash-0.5.0.tar.gz +/gtkhash-0.6.0.tar.gz diff --git a/gtkhash.spec b/gtkhash.spec index f889f11..e18fbe6 100644 --- a/gtkhash.spec +++ b/gtkhash.spec @@ -9,7 +9,7 @@ %global dconfigure %(printf %%s '%configure' | sed 's!\./configure!../configure!g') Name: gtkhash -Version: 0.5.0 +Version: 0.6.0 Release: 1%{?dist} Summary: GTK+ utility for computing message digests or checksums @@ -27,7 +27,6 @@ BuildRequires: libgcrypt-devel BuildRequires: desktop-file-utils gettext intltool %if %{with nautilus} -BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0 %endif @@ -53,7 +52,6 @@ install the %{name}3 package. %package -n %{name}3 Summary: GTK+ utility for computing message digests or checksums Group: Applications/File -Conflicts: %{name} %description -n %{name}3 GtkHash is a GTK+ utility for computing message digests or checksums. Currently @@ -118,11 +116,11 @@ cd gtk2 %if %{with thunar} --enable-thunar \ --disable-nautilus \ - --disable-schemas-install \ + --disable-schemas-compile \ %else --disable-thunar \ --disable-nautilus \ - --disable-schemas-install \ + --disable-schemas-compile \ %endif make %{?_smp_mflags} V=1 @@ -139,10 +137,11 @@ cd ../gtk3 %if %{with nautilus} --enable-nautilus \ --disable-thunar \ - --disable-schemas-install \ + --disable-schemas-compile \ %else --disable-nautilus \ --disable-thunar \ + --disable-schemas-compile \ %endif make %{?_smp_mflags} V=1 @@ -180,19 +179,22 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' rm -rf %{buildroot} -%if %{with nautilus} -%pre nautilus -%gconf_schema_prepare %{name} - +%postun -n %{name}3 +if [ $1 -eq 0 ] ; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi -%post nautilus -%gconf_schema_upgrade %{name} - -%preun nautilus -%gconf_schema_remove %{name} +%if %{with nautilus} +%postun nautilus +if [ $1 -eq 0 ] ; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi %endif +%posttrans +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + %files -f gtk2/%{name}.lang %defattr(-,root,root,-) @@ -200,7 +202,7 @@ rm -rf %{buildroot} %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop - +%{_datadir}/glib-2.0/schemas/app.gtkhash.gschema.xml %files -n %{name}3 -f gtk3/%{name}.lang %defattr(-,root,root,-) @@ -213,9 +215,9 @@ rm -rf %{buildroot} %if %{with nautilus} %files nautilus %defattr(-,root,root,-) -%{_sysconfdir}/gconf/schemas/gtkhash.schemas %{_libdir}/nautilus/extensions-*/libgtkhash-properties.so %{_datadir}/gtkhash/nautilus +%{_datadir}/glib-2.0/schemas/app.gtkhash-properties.gschema.xml %endif @@ -227,6 +229,10 @@ rm -rf %{buildroot} %changelog +* Sat Feb 25 2012 Christoph Wickert - 0.6.0-1 +- Update to 0.6.0 +- Switch to gsettings + * Sat Feb 25 2012 Christoph Wickert - 0.5.0-1 - Update to 0.5.0 - Make extensions require gtkhash(3) base package diff --git a/sources b/sources index 456f1e8..ab42e2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21fc9cddd243c55bd9ff119177ee782a gtkhash-0.5.0.tar.gz +71980923ccf6d11715b1d2bfc7a5dfc6 gtkhash-0.6.0.tar.gz