diff --git a/gnome-user-share-3.0.2.tar.xz b/gnome-user-share-3.0.2.tar.xz deleted file mode 100644 index 621d6ac..0000000 --- a/gnome-user-share-3.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd -size 1008128 diff --git a/gnome-user-share-3.0.3.tar.xz b/gnome-user-share-3.0.3.tar.xz new file mode 100644 index 0000000..cfd2826 --- /dev/null +++ b/gnome-user-share-3.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0196c22fd339922922b2f2558942ef5aac1a0896e7327cf5ab4399ad9f1f1347 +size 1011496 diff --git a/gnome-user-share-soft-dep-apache.patch b/gnome-user-share-soft-dep-apache.patch index 7d8d7c0..3f3af52 100644 --- a/gnome-user-share-soft-dep-apache.patch +++ b/gnome-user-share-soft-dep-apache.patch @@ -1,10 +1,10 @@ -Index: gnome-user-share-0.40/src/file-share-properties.c +Index: gnome-user-share-3.0.3/src/file-share-properties.c =================================================================== ---- gnome-user-share-0.40.orig/src/file-share-properties.c -+++ gnome-user-share-0.40/src/file-share-properties.c -@@ -468,6 +468,9 @@ main (int argc, char *argv[]) - GCONF_CLIENT_PRELOAD_RECURSIVE, - NULL); +--- gnome-user-share-3.0.3.orig/src/file-share-properties.c ++++ gnome-user-share-3.0.3/src/file-share-properties.c +@@ -358,6 +358,9 @@ create_window (void) + + window = GTK_WIDGET (gtk_builder_get_object (builder, "user_share_dialog")); + if (!g_file_test (HTTPD_PROGRAM, G_FILE_TEST_EXISTS)) + gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "vbox3"))); diff --git a/gnome-user-share.changes b/gnome-user-share.changes index 9249cce..9e6a5ce 100644 --- a/gnome-user-share.changes +++ b/gnome-user-share.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Aug 24 19:42:23 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.0.3: + + Remove markup from translatable strings + + Update the appearance of the info bar + + Make gnome-shell pick up the program's name + + Port to GSettings +- Replace gnome-doc-utils-devel BuildRequires with itstool and + libxml2-tools: following upstreams changes +- Drop pkgconfig(Gconf-2.0) BuildRequires: no longer needed after + the port to GSettings. +- Replace gconf_* schema handling with glib2_* variants. + ------------------------------------------------------------------- Thu Mar 22 18:56:54 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-user-share.spec b/gnome-user-share.spec index 125ac20..e18ab5a 100644 --- a/gnome-user-share.spec +++ b/gnome-user-share.spec @@ -17,23 +17,24 @@ Name: gnome-user-share +Version: 3.0.3 +Release: 0 Summary: GNOME user file sharing License: GPL-2.0+ Group: Productivity/Networking/File-Sharing -Version: 3.0.2 -Release: 0 +Url: http://www.gnome.org/ Source: http://download.gnome.org/sources/gnome-user-share/3.0/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE gnome-user-share-soft-dep-apache.patch vuntz@novell.com -- Hide apache option in the UI if it's not available -Patch3: gnome-user-share-soft-dep-apache.patch -Url: http://www.gnome.org/ +Patch0: gnome-user-share-soft-dep-apache.patch BuildRequires: fdupes -BuildRequires: gnome-doc-utils-devel BuildRequires: intltool +BuildRequires: itstool +# Needed for xmllint +BuildRequires: libxml2-tools BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gnome-bluetooth-1.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -42,11 +43,11 @@ BuildRequires: pkgconfig(libnautilus-extension) BuildRequires: pkgconfig(libnotify) Requires: obex-data-server Recommends: %{name}-lang +Suggests: apache2-mod_dnssd Suggests: apache2-prefork Suggests: apache2-worker -Suggests: apache2-mod_dnssd BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description gnome-user-share is a small package that binds together various free @@ -65,7 +66,7 @@ The program also allows to share files using ObexFTP over Bluetooth. %prep %setup -q translation-update-upstream -%patch3 -p1 +%patch0 -p1 %build %configure \ @@ -73,12 +74,12 @@ translation-update-upstream --disable-schemas-install \ --disable-scrollkeeper \ --libexecdir=%{_libexecdir}/gnome-user-share -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install %if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print # X-GNOME-NetworkSettings is okay upstream, but it makes the item appear misplaced with our menu structure @@ -86,36 +87,25 @@ grep -q X-GNOME-NetworkSettings %{buildroot}%{_datadir}/applications/gnome-user- %suse_update_desktop_file -r gnome-user-share-properties GNOME System X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-user-share %find_lang %{name} %{?no_lang_C} -%find_gconf_schemas -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT - -%pre -f %{name}.schemas_pre +rm -rf %{buildroot} %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun -%files -f %{name}.schemas_list +%files %defattr(-,root,root,-) %doc README COPYING NEWS -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf/ -%dir %{_datadir}/omf/%{name}/ -%doc %{_datadir}/omf/%{name}/%{name}-C.omf +%doc %{_datadir}/help/C/%{name}/ %{_bindir}/* %{_libexecdir}/gnome-user-share %{_datadir}/applications/* @@ -123,6 +113,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/nautilus/extensions-3.0/libnautilus-share-extension.so %{_sysconfdir}/xdg/autostart/gnome-user-share.desktop %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png +%{_datadir}/GConf/gsettings/gnome-user-share.convert +%{_datadir}/glib-2.0/schemas/org.gnome.desktop.file-sharing.gschema.xml %files lang -f %{name}.lang