Author: glen Date: Sat Jan 28 20:25:17 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 11.8.16 (new YY.MM.DD versioning scheme)
---- Files affected: packages/gmpc: gmpc.spec (1.42 -> 1.43) , window-title.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/gmpc/gmpc.spec diff -u packages/gmpc/gmpc.spec:1.42 packages/gmpc/gmpc.spec:1.43 --- packages/gmpc/gmpc.spec:1.42 Sat Jan 28 20:29:13 2012 +++ packages/gmpc/gmpc.spec Sat Jan 28 21:25:12 2012 @@ -1,16 +1,14 @@ # $Revision$, $Date$ -# TODO: -# package Humanity icons -# +%define libmpd_ver 0.20.95 Summary: Gnome Music Player Client Summary(pl.UTF-8): Odtwarzacz Gnome Music Player Client Name: gmpc -Version: 0.20.0 -Release: 5 +Version: 11.8.16 +Release: 1 License: GPL v2+ Group: X11/Applications/Sound -Source0: http://downloads.sourceforge.net/musicpd/%{name}-%{version}.tar.gz -# Source0-md5: 902fd69b0b6bb40abb647604080dd7ef +Source0: http://download.sarine.nl/Programs/gmpc/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 223aeb000e41697d8fdf54ccedee89d5 Patch0: %{name}-desktop.patch Patch1: window-title.patch URL: http://www.gmpclient.org/ @@ -19,21 +17,26 @@ BuildRequires: curl-devel BuildRequires: gettext-devel BuildRequires: glib2-devel >= 1:2.16.0 +BuildRequires: gnome-doc-utils BuildRequires: gob2 >= 2.0.17 -BuildRequires: gtk+2-devel >= 2:2.12.0 +BuildRequires: gtk+2-devel >= 2:2.18 BuildRequires: intltool -BuildRequires: libglade2-devel -BuildRequires: libmpd-devel >= 0.19.2 +BuildRequires: libmpd-devel >= 0.20.95 BuildRequires: libsexy-devel BuildRequires: libsoup-devel BuildRequires: libtool +BuildRequires: libunique-devel +BuildRequires: libxml2-devel BuildRequires: libxspf-devel BuildRequires: pkgconfig >= 0.9 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: sqlite3-devel -BuildRequires: vala >= 0.7.10 +BuildRequires: vala >= 0.11.0 BuildRequires: xorg-lib-libSM-devel -%requires_eq libmpd +BuildRequires: xorg-lib-libX11-devel +BuildRequires: zlib-devel +%requires_ge_to libmpd libmpd-devel +Requires: libmpd >= %{libmpd_ver} Requires(post,postun): gtk-update-icon-cache Requires(post,postun): hicolor-icon-theme Obsoletes: gmpc-plugin-favorites @@ -60,7 +63,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia wtyczek dla GMPC Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libmpd-devel >= 0.19.0 +Requires: libmpd-devel >= %{libmpd_ver} %description devel Header files for GMPC plugin developement. @@ -71,7 +74,10 @@ %prep %setup -q %patch0 -p1 +# breaks compilation: http://carme.pld-linux.org/~glen/gmpc.log +touch -r src/playlist3.c src/playlist3.c.foo %patch1 -p1 +touch -r src/playlist3.c.foo src/playlist3.c %build %{__intltoolize} @@ -83,21 +89,28 @@ RC=no \ %configure \ - --enable-system-libsexy + --with-html-dir=%{_gtkdocdir} \ + %{!?with_apidocs:--disable-gtk-doc} \ + --enable-unique \ + +# --enable-appindicator \ + %{__make} %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT{%{_libdir}/%{name}/plugins,%{_datadir}/%{name}/plugins} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# Ubuntu theme, not present in PLD +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/icons/Humanity + # drop javanese translation, need glibc support first rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/jv -%find_lang gmpc +%find_lang %{name} --with-gnome %clean rm -rf $RPM_BUILD_ROOT @@ -108,7 +121,7 @@ %postun %update_icon_cache hicolor -%files -f gmpc.lang +%files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS README %attr(755,root,root) %{_bindir}/gmpc @@ -126,18 +139,9 @@ %{_iconsdir}/hicolor/96x96/apps/gmpc.png %{_iconsdir}/hicolor/128x128/apps/gmpc.png %{_iconsdir}/hicolor/scalable/apps/gmpc.svg -#%{_iconsdir}/Humanity/16x16/apps/gmpc.png -#%{_iconsdir}/Humanity/22x22/apps/gmpc.png -#%{_iconsdir}/Humanity/24x24/apps/gmpc.png -#%{_iconsdir}/Humanity/32x32/apps/gmpc.png -#%{_iconsdir}/Humanity/48x48/apps/gmpc.png -#%{_iconsdir}/Humanity/64x64/apps/gmpc.png -#%{_iconsdir}/Humanity/72x72/apps/gmpc.png -#%{_iconsdir}/Humanity/96x96/apps/gmpc.png -#%{_iconsdir}/Humanity/128x128/apps/gmpc.png -#%{_iconsdir}/Humanity/scalable/apps/gmpc.svg %{_mandir}/man1/gmpc-remote.1* %{_mandir}/man1/gmpc.1* +%{_mandir}/man1/gmpc-remote-stream.1* %files devel %defattr(644,root,root,755) @@ -150,6 +154,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.43 2012/01/28 20:25:12 glen +- up to 11.8.16 (new YY.MM.DD versioning scheme) + Revision 1.42 2012/01/28 19:29:13 glen - setup window title with song name first ================================================================ Index: packages/gmpc/window-title.patch diff -u packages/gmpc/window-title.patch:1.1 packages/gmpc/window-title.patch:1.2 --- packages/gmpc/window-title.patch:1.1 Sat Jan 28 20:29:13 2012 +++ packages/gmpc/window-title.patch Sat Jan 28 21:25:12 2012 @@ -1,20 +1,22 @@ ---- gmpc-0.20.0/src/./playlist3.c~ 2010-03-22 05:18:43.000000000 +0200 -+++ gmpc-0.20.0/src/./playlist3.c 2012-01-28 18:37:04.116982383 +0200 -@@ -813,7 +813,7 @@ - if(gmpc_profiles_get_number_of_profiles(gmpc_profiles) >1){ - gchar *id = gmpc_profiles_get_current(gmpc_profiles); - if(id) { -- string = g_strdup_printf("[%s] %s - %s %s",gmpc_profiles_get_name(gmpc_profiles, id), _("GMPC"), _("Connected to"), mpd_get_hostname(mi)); -+ string = g_strdup_printf("%s - %s %s [%s]", _("GMPC"), _("Connected to"), mpd_get_hostname(mi), gmpc_profiles_get_name(gmpc_profiles, id)); - g_free(id); - } - } -@@ -827,7 +827,7 @@ - if(gmpc_profiles_get_number_of_profiles(gmpc_profiles) >1){ - gchar *id = gmpc_profiles_get_current(gmpc_profiles); - if(id) { -- string = g_strdup_printf("[%s] %s - %s",gmpc_profiles_get_name(gmpc_profiles, id), _("GMPC"), _("Disconnected")); -+ string = g_strdup_printf("%s - %s [%s]", _("GMPC"), _("Disconnected"), gmpc_profiles_get_name(gmpc_profiles, id)); - g_free(id); - } - } +--- gmpc-11.8.16/src/./playlist3.c~ 2011-08-17 06:09:55.000000000 +0300 ++++ gmpc-11.8.16/src/./playlist3.c 2012-01-28 20:22:19.595024784 +0200 +@@ -814,8 +814,7 @@ + if (id) + { + string = +- g_strdup_printf("[%s] %s - %s %s", gmpc_profiles_get_name(gmpc_profiles, id), _("GMPC"), +- _("Connected to"), mpd_get_hostname(mi)); ++ g_strdup_printf("%s - %s %s [%s]", _("GMPC"), _("Connected to"), mpd_get_hostname(mi), gmpc_profiles_get_name(gmpc_profiles, id)); + g_free(id); + } + } +@@ -833,8 +832,7 @@ + if (id) + { + string = +- g_strdup_printf("[%s] %s - %s", gmpc_profiles_get_name(gmpc_profiles, id), _("GMPC"), +- _("Disconnected")); ++ g_strdup_printf("%s - %s [%s]", _("GMPC"), _("Disconnected"), gmpc_profiles_get_name(gmpc_profiles, id)); + g_free(id); + } + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmpc/gmpc.spec?r1=1.42&r2=1.43&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmpc/window-title.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
