rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-drv-nvidia.spec, 1.21, 1.22
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14633/devel
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 180.51 (stable)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 9 Mar 2009 23:11:23 -0000 1.12
+++ .cvsignore 22 Apr 2009 07:52:59 -0000 1.13
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-180.37-pkg0.run
-NVIDIA-Linux-x86_64-180.37-pkg0.run
+NVIDIA-Linux-x86-180.51-pkg0.run
+NVIDIA-Linux-x86_64-180.51-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 9 Mar 2009 23:11:23 -0000 1.12
+++ sources 22 Apr 2009 07:52:59 -0000 1.13
@@ -1,2 +1,2 @@
-ace799a4c119d02ddc6aeed28d598ab3 NVIDIA-Linux-x86-180.37-pkg0.run
-2fc28871c7a89de60dc42240d3ec7231 NVIDIA-Linux-x86_64-180.37-pkg0.run
+871fb27da348c71e4a97a158af80f9dd NVIDIA-Linux-x86-180.51-pkg0.run
+28882531c762f5a8690b658e7e3e410f NVIDIA-Linux-x86_64-180.51-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-nvidia.spec 3 Apr 2009 19:51:21 -0000 1.21
+++ xorg-x11-drv-nvidia.spec 22 Apr 2009 07:52:59 -0000 1.22
@@ -7,8 +7,8 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 180.37
-Release: 3%{?dist}
+Version: 180.51
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -48,10 +48,13 @@
Requires(preun): chkconfig
Provides: nvidia-kmod-common = %{version}
+Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-71xx
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-nvidia-173xx
Conflicts: xorg-x11-drv-fglrx
+Conflicts: xorg-x11-drv-catalyst
Obsoletes: nvidia-kmod < %{version}
#Introduced in F10 for freshrpms compatibility
@@ -60,9 +63,6 @@
#Introduced in F10 when 173xx has forked to legacy serie
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
-#Introduced in F11 when opengl 3.0 beta has merged back
-Obsoletes: xorg-x11-drv-nvidia-beta < 180.35-100
-Provides: xorg-x11-drv-nvidia-beta = 180.35-101
%description
@@ -81,9 +81,6 @@
#Introduced in F10 when 173xx has forked to legacy serie
Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100
Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101
-#Introduced in F11 when opengl 3.0 beta has merged back
-Obsoletes: xorg-x11-drv-nvidia-beta-devel < 180.35-100
-Provides: xorg-x11-drv-nvidia-beta-devel = 180.35-101
%description devel
This package provides the development files of the %{name} package,
@@ -103,9 +100,6 @@
#Introduced in F10 when 173xx has forked to legacy serie
Obsoletes: xorg-x11-drv-nvidia-newest-libs < %{version}-100
Provides: xorg-x11-drv-nvidia-newest-libs = %{version}-101
-#Introduced in F11 when opengl 3.0 beta has merged back
-Obsoletes: xorg-x11-drv-nvidia-beta-libs < 180.35-100
-Provides: xorg-x11-drv-nvidia-beta-libs = 180.35-101
%description libs
This package provides the shared libraries for %{name}.
@@ -310,6 +304,11 @@
%changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1
+- Update to 180.51 (stable)
+- Add 71xx/beta/catalyst Conflicts
+- Don't Obsoletes the beta serie anymore (only the newest)
+
* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 180.37-3
- Fix x86 Arch for fedora >= 11
15 years, 7 months
rpms/xorg-x11-drv-nvidia/F-10 sources, 1.8, 1.9 xorg-x11-drv-nvidia.spec, 1.15, 1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14633/F-10
Modified Files:
sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 180.51 (stable)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 13 Feb 2009 09:10:51 -0000 1.8
+++ sources 22 Apr 2009 07:53:00 -0000 1.9
@@ -1,2 +1,2 @@
-db9aa3683988b7b0872abae7182f5bc5 NVIDIA-Linux-x86-180.29-pkg0.run
-318e36822c095fcd410161b1326797b1 NVIDIA-Linux-x86_64-180.29-pkg0.run
+871fb27da348c71e4a97a158af80f9dd NVIDIA-Linux-x86-180.51-pkg0.run
+28882531c762f5a8690b658e7e3e410f NVIDIA-Linux-x86_64-180.51-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-nvidia.spec 22 Feb 2009 18:13:32 -0000 1.15
+++ xorg-x11-drv-nvidia.spec 22 Apr 2009 07:53:00 -0000 1.16
@@ -7,8 +7,8 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 180.29
-Release: 2%{?dist}
+Version: 180.51
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -26,7 +26,11 @@
%define __find_requires %{SOURCE91}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64
+%if 0%{?fedora} >= 11
+ExclusiveArch: i586 x86_64
+%else
+ExclusiveArch: i386 x86_64
+%endif
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
@@ -44,16 +48,19 @@
Requires(preun): chkconfig
Provides: nvidia-kmod-common = %{version}
+Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-71xx
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-nvidia-173xx
-Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-fglrx
+Conflicts: xorg-x11-drv-catalyst
Obsoletes: nvidia-kmod < %{version}
+#Introduced in F10 for freshrpms compatibility
Obsoletes: nvidia-x11-drv < %{version}-%{release}
Provides: nvidia-x11-drv = %{version}-%{release}
-
+#Introduced in F10 when 173xx has forked to legacy serie
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
@@ -71,6 +78,9 @@
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+#Introduced in F10 when 173xx has forked to legacy serie
+Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100
+Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101
%description devel
This package provides the development files of the %{name} package,
@@ -87,6 +97,9 @@
Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release}
Provides: nvidia-x11-drv-32bit = %{version}-%{release}
%endif
+#Introduced in F10 when 173xx has forked to legacy serie
+Obsoletes: xorg-x11-drv-nvidia-newest-libs < %{version}-100
+Provides: xorg-x11-drv-nvidia-newest-libs = %{version}-101
%description libs
This package provides the shared libraries for %{name}.
@@ -291,6 +304,28 @@
%changelog
+* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 180.51-1
+- Update to 180.51 (stable)
+- Add 71xx/beta/catalyst Conflicts
+- Don't Obsoletes the beta serie anymore (only the newest)
+
+* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 180.37-3
+- Fix x86 Arch for fedora >= 11
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.37-2
+- rebuild for new F11 features
+
+* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 180.37-1
+- Update to 180.37 (prerelease)
+
+* Thu Feb 26 2009 kwizart < kwizart at gmail.com > - 180.35-2
+- Fix Conflicts/Provides with beta
+- Obsoltes/Provides for devel
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 180.35-1
+- Update to 180.35 (prerelease)
+- Obsoletes opengl 3.0 beta nserie.
+
* Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 180.29-2
- Make devel subpackage depend on lib subpackage of the same arch
15 years, 7 months
rpms/gnome-mplayer/F-9 gnome-mplayer-0.9.5-nautilus-translation.patch, NONE, 1.1 gnome-mplayer.spec, 1.15, 1.16
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22586
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-0.9.5-nautilus-translation.patch
Log Message:
* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-3
- Added patch fixing breaking nautilus translation from SVN
gnome-mplayer-0.9.5-nautilus-translation.patch:
--- NEW FILE gnome-mplayer-0.9.5-nautilus-translation.patch ---
Index: src/nautilus_property_page.c
===================================================================
--- src/nautilus_property_page.c (wersja 1179)
+++ src/nautilus_property_page.c (wersja 1246)
@@ -22,7 +22,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "mime_types.h"
#include <libnautilus-extension/nautilus-extension-types.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
@@ -82,9 +84,9 @@
}
if (hour == 0) {
- result = g_strdup_printf(_("%2i:%02.0f"), min, seconds);
+ result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%2i:%02.0f"), min, seconds);
} else {
- result = g_strdup_printf(_("%i:%02i:%02.0f"), hour, min, seconds);
+ result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%i:%02i:%02.0f"), hour, min, seconds);
}
return g_strstrip(result);
}
@@ -263,7 +265,7 @@
data = get_metadata(filename);
- label = gtk_label_new(_("<span weight=\"bold\">Media Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Media Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
@@ -271,7 +273,7 @@
i++;
if (data->title && strlen(data->title) > 0) {
- label = gtk_label_new(_("Title"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Title"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -283,7 +285,7 @@
}
if (data->artist && strlen(data->artist) > 0) {
- label = gtk_label_new(_("Artist"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Artist"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -295,7 +297,7 @@
}
if (data->album && strlen(data->album) > 0) {
- label = gtk_label_new(_("Album"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Album"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -307,7 +309,7 @@
}
if (data->length) {
- label = gtk_label_new(_("Length"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Length"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -319,7 +321,7 @@
}
if (data->demuxer && strlen(data->demuxer) > 0) {
- label = gtk_label_new(_("Demuxer"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Demuxer"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -331,14 +333,14 @@
}
if (data->video_present) {
- label = gtk_label_new(_("<span weight=\"bold\">Video Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Video Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
i++;
- label = gtk_label_new(_("Video Size:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Size:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -349,7 +351,7 @@
g_free(buf);
i++;
- label = gtk_label_new(_("Video Codec:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Codec:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -360,7 +362,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Video Bitrate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Bitrate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -371,7 +373,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Video Frame Rate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Frame Rate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -385,14 +387,14 @@
}
if (data->audio_present) {
- label = gtk_label_new(_("<span weight=\"bold\">Audio Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Audio Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
i++;
- label = gtk_label_new(_("Audio Codec:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Codec:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -403,7 +405,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Audio Bitrate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Bitrate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -415,7 +417,7 @@
i++;
if (g_strtod(data->audio_nch, NULL) > 0) {
- label = gtk_label_new(_("Audio Channels:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Channels:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -473,7 +475,7 @@
if (found) {
uri = nautilus_file_info_get_uri(file);
- label = gtk_label_new(_("Audio/Video"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio/Video"));
page = gtk_table_new(20, 2, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(page), 6);
if (get_properties(page, uri)) {
@@ -528,7 +530,9 @@
#ifdef ENABLE_NLS
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- textdomain(GETTEXT_PACKAGE);
+ // specify the domain in the translation calls so
+ // we don't mess up the translation of the other tabs
+ // textdomain(GETTEXT_PACKAGE);
#endif
gnome_mplayer_properties_plugin_register_type(module);
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-9/gnome-mplayer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-mplayer.spec 13 Mar 2009 17:47:05 -0000 1.15
+++ gnome-mplayer.spec 21 Apr 2009 21:17:04 -0000 1.16
@@ -1,12 +1,13 @@
Name: gnome-mplayer
Version: 0.9.5
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-0.9.5-nautilus-translation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -88,6 +89,12 @@
mv %{name}-%{version} generic
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd generic
+%patch0 -p0 -b .nautilus
+popd
+pushd minimal
+%patch0 -p0 -b .nautilus
+popd
%build
@@ -189,6 +196,12 @@
%changelog
+* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-3
+- Added patch fixing breaking nautilus translation from SVN
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.5-2
+- rebuild for new F11 features
+
* Fri Mar 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-1
- Updated to 0.9.5
- Added nautilus-devel to BuildRequires
15 years, 7 months
rpms/gnome-mplayer/F-10 gnome-mplayer-0.9.5-nautilus-translation.patch, NONE, 1.1 gnome-mplayer.spec, 1.14, 1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22488
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-0.9.5-nautilus-translation.patch
Log Message:
* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-3
- Added patch fixing breaking nautilus translation from SVN
gnome-mplayer-0.9.5-nautilus-translation.patch:
--- NEW FILE gnome-mplayer-0.9.5-nautilus-translation.patch ---
Index: src/nautilus_property_page.c
===================================================================
--- src/nautilus_property_page.c (wersja 1179)
+++ src/nautilus_property_page.c (wersja 1246)
@@ -22,7 +22,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "mime_types.h"
#include <libnautilus-extension/nautilus-extension-types.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
@@ -82,9 +84,9 @@
}
if (hour == 0) {
- result = g_strdup_printf(_("%2i:%02.0f"), min, seconds);
+ result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%2i:%02.0f"), min, seconds);
} else {
- result = g_strdup_printf(_("%i:%02i:%02.0f"), hour, min, seconds);
+ result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%i:%02i:%02.0f"), hour, min, seconds);
}
return g_strstrip(result);
}
@@ -263,7 +265,7 @@
data = get_metadata(filename);
- label = gtk_label_new(_("<span weight=\"bold\">Media Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Media Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
@@ -271,7 +273,7 @@
i++;
if (data->title && strlen(data->title) > 0) {
- label = gtk_label_new(_("Title"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Title"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -283,7 +285,7 @@
}
if (data->artist && strlen(data->artist) > 0) {
- label = gtk_label_new(_("Artist"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Artist"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -295,7 +297,7 @@
}
if (data->album && strlen(data->album) > 0) {
- label = gtk_label_new(_("Album"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Album"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -307,7 +309,7 @@
}
if (data->length) {
- label = gtk_label_new(_("Length"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Length"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -319,7 +321,7 @@
}
if (data->demuxer && strlen(data->demuxer) > 0) {
- label = gtk_label_new(_("Demuxer"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Demuxer"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -331,14 +333,14 @@
}
if (data->video_present) {
- label = gtk_label_new(_("<span weight=\"bold\">Video Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Video Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
i++;
- label = gtk_label_new(_("Video Size:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Size:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -349,7 +351,7 @@
g_free(buf);
i++;
- label = gtk_label_new(_("Video Codec:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Codec:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -360,7 +362,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Video Bitrate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Bitrate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -371,7 +373,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Video Frame Rate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Frame Rate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -385,14 +387,14 @@
}
if (data->audio_present) {
- label = gtk_label_new(_("<span weight=\"bold\">Audio Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Audio Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
i++;
- label = gtk_label_new(_("Audio Codec:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Codec:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -403,7 +405,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Audio Bitrate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Bitrate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -415,7 +417,7 @@
i++;
if (g_strtod(data->audio_nch, NULL) > 0) {
- label = gtk_label_new(_("Audio Channels:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Channels:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -473,7 +475,7 @@
if (found) {
uri = nautilus_file_info_get_uri(file);
- label = gtk_label_new(_("Audio/Video"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio/Video"));
page = gtk_table_new(20, 2, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(page), 6);
if (get_properties(page, uri)) {
@@ -528,7 +530,9 @@
#ifdef ENABLE_NLS
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- textdomain(GETTEXT_PACKAGE);
+ // specify the domain in the translation calls so
+ // we don't mess up the translation of the other tabs
+ // textdomain(GETTEXT_PACKAGE);
#endif
gnome_mplayer_properties_plugin_register_type(module);
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-10/gnome-mplayer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-mplayer.spec 13 Mar 2009 17:46:54 -0000 1.14
+++ gnome-mplayer.spec 21 Apr 2009 21:16:52 -0000 1.15
@@ -1,12 +1,13 @@
Name: gnome-mplayer
Version: 0.9.5
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-0.9.5-nautilus-translation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -88,6 +89,12 @@
mv %{name}-%{version} generic
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd generic
+%patch0 -p0 -b .nautilus
+popd
+pushd minimal
+%patch0 -p0 -b .nautilus
+popd
%build
@@ -189,6 +196,12 @@
%changelog
+* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-3
+- Added patch fixing breaking nautilus translation from SVN
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.5-2
+- rebuild for new F11 features
+
* Fri Mar 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-1
- Updated to 0.9.5
- Added nautilus-devel to BuildRequires
15 years, 7 months
rpms/gnome-mplayer/devel gnome-mplayer-0.9.5-nautilus-translation.patch, NONE, 1.1 gnome-mplayer.spec, 1.16, 1.17
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22380
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-0.9.5-nautilus-translation.patch
Log Message:
* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-3
- Added patch fixing breaking nautilus translation from SVN
gnome-mplayer-0.9.5-nautilus-translation.patch:
--- NEW FILE gnome-mplayer-0.9.5-nautilus-translation.patch ---
Index: src/nautilus_property_page.c
===================================================================
--- src/nautilus_property_page.c (wersja 1179)
+++ src/nautilus_property_page.c (wersja 1246)
@@ -22,7 +22,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "mime_types.h"
#include <libnautilus-extension/nautilus-extension-types.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
@@ -82,9 +84,9 @@
}
if (hour == 0) {
- result = g_strdup_printf(_("%2i:%02.0f"), min, seconds);
+ result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%2i:%02.0f"), min, seconds);
} else {
- result = g_strdup_printf(_("%i:%02i:%02.0f"), hour, min, seconds);
+ result = g_strdup_printf(dgettext(GETTEXT_PACKAGE,"%i:%02i:%02.0f"), hour, min, seconds);
}
return g_strstrip(result);
}
@@ -263,7 +265,7 @@
data = get_metadata(filename);
- label = gtk_label_new(_("<span weight=\"bold\">Media Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Media Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
@@ -271,7 +273,7 @@
i++;
if (data->title && strlen(data->title) > 0) {
- label = gtk_label_new(_("Title"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Title"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -283,7 +285,7 @@
}
if (data->artist && strlen(data->artist) > 0) {
- label = gtk_label_new(_("Artist"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Artist"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -295,7 +297,7 @@
}
if (data->album && strlen(data->album) > 0) {
- label = gtk_label_new(_("Album"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Album"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -307,7 +309,7 @@
}
if (data->length) {
- label = gtk_label_new(_("Length"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Length"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -319,7 +321,7 @@
}
if (data->demuxer && strlen(data->demuxer) > 0) {
- label = gtk_label_new(_("Demuxer"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Demuxer"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -331,14 +333,14 @@
}
if (data->video_present) {
- label = gtk_label_new(_("<span weight=\"bold\">Video Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Video Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
i++;
- label = gtk_label_new(_("Video Size:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Size:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -349,7 +351,7 @@
g_free(buf);
i++;
- label = gtk_label_new(_("Video Codec:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Codec:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -360,7 +362,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Video Bitrate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Bitrate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -371,7 +373,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Video Frame Rate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Video Frame Rate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -385,14 +387,14 @@
}
if (data->audio_present) {
- label = gtk_label_new(_("<span weight=\"bold\">Audio Details</span>"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"<span weight=\"bold\">Audio Details</span>"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 0, 6);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
i++;
- label = gtk_label_new(_("Audio Codec:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Codec:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -403,7 +405,7 @@
gtk_table_attach_defaults(GTK_TABLE(page), label, 1, 2, i, i + 1);
i++;
- label = gtk_label_new(_("Audio Bitrate:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Bitrate:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -415,7 +417,7 @@
i++;
if (g_strtod(data->audio_nch, NULL) > 0) {
- label = gtk_label_new(_("Audio Channels:"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio Channels:"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
gtk_misc_set_padding(GTK_MISC(label), 12, 0);
gtk_table_attach_defaults(GTK_TABLE(page), label, 0, 1, i, i + 1);
@@ -473,7 +475,7 @@
if (found) {
uri = nautilus_file_info_get_uri(file);
- label = gtk_label_new(_("Audio/Video"));
+ label = gtk_label_new(dgettext(GETTEXT_PACKAGE,"Audio/Video"));
page = gtk_table_new(20, 2, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(page), 6);
if (get_properties(page, uri)) {
@@ -528,7 +530,9 @@
#ifdef ENABLE_NLS
bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
- textdomain(GETTEXT_PACKAGE);
+ // specify the domain in the translation calls so
+ // we don't mess up the translation of the other tabs
+ // textdomain(GETTEXT_PACKAGE);
#endif
gnome_mplayer_properties_plugin_register_type(module);
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-mplayer.spec 29 Mar 2009 13:11:31 -0000 1.16
+++ gnome-mplayer.spec 21 Apr 2009 21:16:42 -0000 1.17
@@ -1,12 +1,13 @@
Name: gnome-mplayer
Version: 0.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-0.9.5-nautilus-translation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -88,6 +89,12 @@
mv %{name}-%{version} generic
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd generic
+%patch0 -p0 -b .nautilus
+popd
+pushd minimal
+%patch0 -p0 -b .nautilus
+popd
%build
@@ -189,6 +196,9 @@
%changelog
+* Tue Apr 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.5-3
+- Added patch fixing breaking nautilus translation from SVN
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.5-2
- rebuild for new F11 features
15 years, 7 months
rpms/cairo-dock/devel cairo-dock.spec,1.1,1.2
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12545
Modified Files:
cairo-dock.spec
Log Message:
Ah...
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cairo-dock.spec 21 Apr 2009 18:38:20 -0000 1.1
+++ cairo-dock.spec 21 Apr 2009 18:40:23 -0000 1.2
@@ -17,7 +17,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 0.3.2
+%global fedora_main_rel 0.4
%if 0%{?released} < 1
15 years, 7 months
rpms/cairo-dock/devel cairo-dock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12243
Modified Files:
.cvsignore sources
Added Files:
cairo-dock.spec
Log Message:
Initial commit
--- NEW FILE cairo-dock.spec ---
# NOTE!
# Now for weblet plug-ins now cairo-dock uses WebKit, not Gecko.
# For svn
# svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk
# cd trunk
# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
%global released 1
# Set the below to 1 when building unstable plug-ins
%global build_other 1
%global mainver 2.0.0
%global betaver rc3
%global tarballver svn1527_trunk
%global build_webkit 1
%global build_xfce 1
%global fedora_main_rel 0.3.2
%if 0%{?released} < 1
%global fedora_rel 0.%{fedora_main_rel}.%{tarballver}
%else
%global fedora_rel %{fedora_main_rel}%{?betaver:.%betaver}
%endif
%if 0%{?released} >= 1
%global build_other 0
%endif
# Now WebKit plug-in is (will be) included in released tarball
%if %{build_other} < 1
%global build_webkit 1
%endif
%global build_themes 0
Name: cairo-dock
Version: %{mainver}
Release: %{fedora_rel}%{?dist}
Summary: Light eye-candy fully themable animated dock
Group: User Interface/Desktops
License: GPLv3+
URL: http://www.cairo-dock.org/
%if 0%{?released} < 1
Source0: %{name}-sources-%{tarballver}.tar.bz2
%else
Source0: http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%beta...
%if %{build_themes}
Source1: http://download.berlios.de/cairo-dock/%{name}-themes-%{mainver}%{?betaver...
%endif
# Some trademarked icons under Cairo-Penguin should be removed
# After unpacking tarball, remove:
# - Cairo-Penguin/data/themes/{Mario,The_Simpsons}
#Source2: http://download.berlios.de/cairo-dock/%{name}-plugins-%{mainver}%{?betave...
Source2: %{name}-plugins-%{mainver}%{?betaver:-%betaver}-modified.tar.bz2
%endif
# Very temporary, brought from svn trun rev. 1667
Source100: cairo-dock-2.0.0-rc3-missing-files.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{released}
BuildRequires: automake
BuildRequires: intltool
BuildRequires: libtool
%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
# For main package
BuildRequires: dbus-glib-devel
BuildRequires: glitz-glx-devel
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
BuildRequires: librsvg2-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXinerama-devel
BuildRequires: libXrender-devel
BuildRequires: libxml2-devel
BuildRequires: libXtst-devel
BuildRequires: perl(XML::Parser)
# For plug-ins
BuildRequires: alsa-lib-devel
BuildRequires: gnome-keyring-devel
BuildRequires: gnome-menus-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: gnutls-devel
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
BuildRequires: libetpan-devel
# For plug-ins-xfce
%if %{build_xfce} > 0
BuildRequires: Thunar-devel
%endif
%if %{build_webkit} > 0
# For plug-ins-webkit
# Now using webkit, not gecko
BuildRequires: WebKit-gtk-devel
%endif
# Obsoletes moved to main package
# Switch to Webkit, always obsolete gecko (and _not_ provide it)
Obsoletes: %{name}-plug-ins-gecko < %{version}-%{release}
%if %{build_webkit} == 0
Obsoletes: %{name}-plug-ins-webkit < %{version}-%{release}
%endif
%if %{build_xfce} == 0
Obsoletes: %{name}-plug-ins-xfce < %{version}-%{release}
%endif
# cairo-dock-themes is obsoleted
%if ! %{build_themes}
Obsoletes: %{name}-themes < %{version}-%{release}
%endif
%description
An light eye-candy fully themable animated dock for any
Linux desktop. It has a family-likeness with OSX dock,
but with more options.
%package themes
Summary: Additional themes for %{name}
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description themes
This package contains a set of additional themes for %{name}.
%package plug-ins
Summary: Plug-ins files for %{name}
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description plug-ins
This package contains plug-ins files for %{name}.
%package plug-ins-xfce
Summary: Plug-ins files for %{name} related to Xfce
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description plug-ins-xfce
This package contains plug-ins files for %{name} related
to Xfce.
%package plug-ins-webkit
Summary: Plug-ins files for %{name} related to Gecko
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description plug-ins-webkit
This package contains plug-ins files for %{name} related
to webkit.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: dbus-glib-devel
Requires: gtk2-devel
Requires: glitz-glx-devel
Requires: librsvg2-devel
Requires: libxml2-devel
Requires: libXtst-devel
%description devel
The %{name}-devel package contains libraries, build data, and header
files for developing applications that use %{name}.
%prep
%if 0%{released} < 1
%setup -q -c
%else
###
%if %{build_themes}
%setup -q -c -a 1 -a 2
%endif
%setup -q -c -a 2 -a 100
%{__ln_s} -f cairo-dock-%{mainver}%{?betaver:-%betaver} cairo-dock
%if %{build_themes}
%{__ln_s} -f cairo-dock-themes-%{mainver}%{?betaver:-%betaver} themes
%endif
%{__ln_s} -f cairo-dock-plugins-%{mainver}%{?betaver:-%betaver} plug-ins
%endif
###
## Temporary
##
%{__cp} -a trunk/plug-ins/MISSING_FILES/* plug-ins/
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
%endif
pushd .
# A. main
cd cairo-dock
# permission
for dir in */
do
find $dir -type f | xargs %{__chmod} 0644
done
%{__chmod} 0644 [A-Z]*
# Makefile issue
%{__sed} -i.debuglevel -e '/-O3/d' \
%if 0%{?released} > 0
src/Makefile.in
%else
src/Makefile.am
autoreconf -i -f
%endif
# desktop file
%{__sed} -i.icon \
-e 's|Icon=\*|Icon=cairo-dock|' \
data/cairo-dock*.desktop
# B. themes
%if %{build_themes}
cd ../themes
%if 0%{?released} < 1
autoreconf -i -f
%endif
%endif
# C. plug-ins
cd ../plug-ins
# permission
%if 0%{?released} < 1
%{__chmod} 0644 Applets.stable
%endif
find . -name \*.h -or -name \*.c | xargs %{__chmod} 0644
# source code fix
# Cairo-Penguin
## Removing trademarked icons
## The following directories are (should be) also removed from the tarball
##
## Note:
## This is under discussion with upstream
%{__sed} -i.icon \
-e '/The_Simpsons/d' \
-e '/Mario/d' \
%if 0%{?released} < 1
Cairo-Penguin/data/themes/Makefile.am \
configure.ac
%else
Cairo-Penguin/data/themes/Makefile.in
%endif
%if 0%{?released} < 1
%{__sed} -i.icon2 -e '$s|\\$||' Cairo-Penguin/data/themes/Makefile.am
%else
%{__sed} -i.icon2 -e 's|SantaClaus \\|SantaClaus|' Cairo-Penguin/data/themes/Makefile.in
%{__sed} -i.icon \
-e '/ac_config_files/s|Cairo-Penguin[^ ][^ ]*/Mario/Makefile| |g' \
-e '/ac_config_files/s|Cairo-Penguin[^ ][^ ]*/The_Simpsons/Makefile| |g' \
-e '\@CONFIG_FILES=.*Mario/Makefile(a)d' \
-e '\@CONFIG_FILES=.*The_Simpsons/Makefile(a)d' \
configure
%endif
# dialog-rendering
find dialog-rendering -type f \
\( -not -path '*/.svn/*' -and -not -name \*.png \) \
| xargs %{__sed} -i -e 's|\r||'
# dustbin
%{__sed} -i.ppc64 \
-e 's|g_atomic_pointer_get|g_atomic_int_get|' \
dustbin/src/applet-trashes-manager.c
# keyboard-indicator
%{__sed} -i.po \
-e 's|@GETTEXT_CD_PKG@|@GETTEXT_KEYBOARD_INDICATOR@|' \
keyboard-indicator/po/Makefile.in.in
# mail: license conflict now resolved
# stacks: directory fix
%if 0%{?released} < 1
%{__sed} -i.dir -e '/stacksdatadir/s|pluginsdir|pluginsdatadir|' \
stacks/configure.ac
%endif
# quick-browser, Toons
# Not imported into released tarball yet
%if 0%{?released}
for plugs in \
quick-browser \
Toons
do
%{__sed} -i.p2 \
-e "/ac_config_files/s|${plugs}/[^ ][^ ]*| |g" \
-e "\@CONFIG_FILES=.*${plugs}(a)d" \
configure
done
%endif
# rhythmbox
pushd rhythmbox/data/themes
%{__sed} -i -e '/ipod/d' \
%if 0%{?released}
Makefile.in
%else
Makefile.am
%endif
popd
# template: upstream says this is not needed
%{__rm} -rf template/
# weblets
# Now for weblet plugin, webkit is used on Fedora, not gecko
cd weblets/
%{__sed} -i.gettext \
-e '/^GETTEXT_PACKAGE/s|@GETTEXT_PACKAGE@|@GETTEXT_WEBLETS@|' \
po/Makefile.in.in
cd ..
# First deal with subdirs in configure.ac of topdir, then else
if [ -f Makefile.am ] ; then
Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$(a)p' Makefile.am | sed -e 's|\\$||' | tail -n +2)
%{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
# Now bash 4.0 "source" command does not search for the current
# directory when executed as "sh" (in posix mode)
. ./eval.sh
Subdirs=$(eval echo ${Subdirs_1})
# Register Subdirs
echo $Subdirs > Subdirs.list
else
rm -f Subdirs.list
for ddir in */ ; do echo $ddir >> Subdirs.list ; done
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
for dir in */
do
skip=0
for ddir in $Subdirs
do
if [ $dir == ${ddir}/ ] ; then skip=1; fi
done
for ddir in autom* po translations
do
if [ $dir == ${ddir}/ ] ; then skip=2 ; fi
done
if [ $skip == 2 ] ; then continue ; fi
cd $dir
%{__sed} -i.error \
-e 's|-O3|-O2|' \
-e 's|-Werror\\|\\|' \
-e 's|-Werror$||' \
%if 0%{?released} > 0
src/Makefile.in
%else
src/Makefile.am
%endif
if [ $skip == 1 ] ; then
cd ..
continue
fi
%if %{build_other} > 0
autoreconf -i -f
%endif
cd ..
done
%if %{released} < 1
autoreconf -f -i
%endif
popd # from opt/cairo-dock/trunk/cairo-dock
%build
status=0
%global __make \
%{_bindir}/make -k GMSGFMT="%{_bindir}/msgfmt --statistics"
# A. main
pushd cairo-dock
# --enable-glitz cannot be set because cairo-glitz.h is missing
# (Fedora cairo does not support glitz)
%configure
%{__make} %{?_smp_mflags} || status=$((status+1))
# For plug-ins & themes
unlink cairo-dock || :
ln -sf src cairo-dock
export CFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
export CPPFLAGS="%optflags -I$(pwd) -I$(pwd)/cairo-dock"
export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
# B themes
%if %{build_themes}
cd ../themes
%configure
%{__make} %{?_smp_mflags} || status=$((status+1))
%endif
# C plug-ins
cd ../plug-ins
# First deal with subdirs in topdir configure.ac, then else
%configure \
--enable-gio \
# Parallel make fails some times, but it is gerenally fast
# so do parallel make anyway first
retry=0
%{__make} %{?_smp_mflags} || retry=1
if [ $retry == 1 ] ; then
%{__make} || status=$((status+1))
fi
%if %{build_other} >= 1
Subdirs=$(cat Subdirs.list)
for dir in */
do
unset CONFIGURE_OPTS
skip=0
for ddir in $Subdirs autom* po translations
do
if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
done
if [ $skip == 1 ] ; then continue ; fi
cd $dir
%configure $CONFIGURE_OPTS
# Parallel make fails some times, but it is gerenally fast
# so do parallel make anyway first
%{__make} %{?_smp_mflags} -k || :
%{__make} -k || status=$((status+1))
cd ..
done
%endif
popd # from opt/cairo-dock/trunk/cairo-dock
if [ $status -gt 0 ] ; then exit 1 ; fi
%install
%{__rm} -rf $RPM_BUILD_ROOT
TOPDIR=$(pwd)
# A. main
pushd cairo-dock
export PKG_CONFIG_PATH=$(pwd):${PKG_CONFIG_PATH}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
%{__chmod} 0755 $RPM_BUILD_ROOT%{_bindir}/*.sh
# debian file, not useful
%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/cairo-dock-update.sh
for f in $RPM_BUILD_ROOT%{_datadir}/applications/*desktop
do
desktop-file-validate $f
done
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/pixmaps
%{__install} -cpm 644 data/%{name}.svg \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/
# documents
%{__rm} -rf $TOPDIR/documents/main
%{__mkdir} -p $TOPDIR/documents/main
for f in \
LICENSE \
data/ChangeLog.txt \
%if 0%{?released} < 1
doc/HOW-TO__applets.txt \
doc/dox.config \
%endif
do
%{__cp} -pr $f $TOPDIR/documents/main/
done
%find_lang %{name}
%{__mv} -f %{name}.lang $TOPDIR
# B. themes
%if %{build_themes}
cd ../themes
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
# clean up
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
# no...
%{__rm} -rf ./_Ubuntu_/
popd # from $RPM_BUILD_ROOT
%endif
# C plug-ins
%{__rm} -rf $TOPDIR/{lang-plug-ins,lang-webkit}
%{__mkdir} -p $TOPDIR/{lang-plug-ins,lang-webkit}
cd ../plug-ins
# First deal with subdirs in topdir configure.ac, then else
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
Subdirs=$(cat Subdirs.list)
for dir in */
do
skip=0
for ddir in $Subdirs
do
if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
done
# don't skip here
# if [ $skip == 1 ] ; then continue ; fi
for ddir in autom* po translations
do
if [ $dir == ${ddir}/ ] ; then skip=2 ; fi
done
if [ $skip == 2 ] ; then continue ; fi
cd $dir
%if %{build_other} >= 1
[ $skip != 1 ] && \
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -p"
%endif
# read GETTEXT_PACKAGE
if [ ! -r po/Makefile.in ] ; then
cd ..
continue
fi
GETTEXT_MO_PACKAGES=`sed -n -e 's|^GETTEXT_PACKAGE *= *||p' po/Makefile.in`
case $GETTEXT_MO_PACKAGES in
*weblet* )
%find_lang $GETTEXT_MO_PACKAGES && \
%{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \
$TOPDIR/lang-webkit/
;;
* )
%find_lang $GETTEXT_MO_PACKAGES && \
%{__mv} -f ${GETTEXT_MO_PACKAGES}.lang \
$TOPDIR/lang-plug-ins/
;;
esac
cd ..
done
# Temporary hack
find $RPM_BUILD_ROOT%{_libdir}/cairo-dock/ -name \*.so | xargs %{__chmod} 0755
find $RPM_BUILD_ROOT%{_libdir}/cairo-dock -name \*.so.* | xargs %{__rm} -f
# documents
%if 0%{?released} < 1
%{__cp} -p Applets.stable $TOPDIR/documents/main/
%endif
# lang files
find $TOPDIR/lang-plug-ins/ -name '*.lang' | xargs cat > $TOPDIR/lang-plug-ins.lang
%if %{build_webkit} > 0
find $TOPDIR/lang-webkit/ -name '*.lang' | xargs cat > $TOPDIR/lang-webkit.lang
%endif
popd # from opt/cairo-dock/trunk/cairo-dock
# final clean up
# remove all unneeded files
pushd $RPM_BUILD_ROOT
%{__rm} -f ./%{_datadir}/%{name}/{ChangeLog.txt,License}
find .%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f
# just to suppress rpmlint...
for f in \
`find ./%{_datadir}/%{name} -name \*.desktop` \
`find . -name \*.conf`
do
echo > $f.tmp
cat $f >> $f.tmp
touch -r $f $f.tmp
%{__mv} -f $f.tmp $f
done
set +x
for f in .%{_datadir}/%{name}/plug-ins/*/*
do
if head -n 1 $f 2>/dev/null | grep -q /bin/ ; then
set -x
%{__chmod} 0755 $f
set +x
fi
done
set -x
popd # from $RPM_BUILD_ROOT
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc documents/main/*
%{_bindir}/*%{name}*
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}.svg
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*.conf
%{_datadir}/%{name}/*.png
%{_datadir}/%{name}/*.svg
%{_datadir}/%{name}/*.xpm
%{_datadir}/%{name}/*view
%{_datadir}/%{name}/emblems/
%{_datadir}/%{name}/explosion/
%{_datadir}/%{name}/gauges/
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/plug-ins/
%{_datadir}/%{name}/themes/_default_/
# only directory
%dir %{_libdir}/%{name}/
%if %{build_themes}
%files themes
%defattr(-,root,root,-)
%{_datadir}/%{name}/themes/_[A-Z]*/
%endif
%files plug-ins -f lang-plug-ins.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}/*
%{_datadir}/%{name}/plug-ins/*
%if %{build_webkit} > 0
%exclude %{_libdir}/%{name}/*weblet*
%exclude %{_datadir}/%{name}/plug-ins/*weblet*
%endif
%if %{build_xfce} > 0
%exclude %{_libdir}/%{name}/*xfce*
%exclude %{_datadir}/%{name}/plug-ins/*xfce*
%endif
%if %{build_xfce} > 0
%files plug-ins-xfce
%defattr(-,root,root,-)
%{_libdir}/%{name}/*xfce*
%{_datadir}/%{name}/plug-ins/*xfce*
%endif
%if %{build_webkit} > 0
%files plug-ins-webkit -f lang-webkit.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}/*weblet*
%{_datadir}/%{name}/plug-ins/*weblet*
%endif
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/*.pc
%changelog
* Sat Apr 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.0-0.4.rc3
- 2.0.0 rc3
- Move to rpmfusion
- Enable mail plugin, license is now changed to GPL+
- borrow some missing files from svn trunk for rc3
- Drop "fedora-" prefix from desktop file
* Wed Feb 11 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1527
* Thu Jan 22 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1496
- Include Wanda directory in Cairo-Penguin plug-in again
* Thu Jan 15 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1484
- Trademarked icons under plug-ins/Cairo-Penguin/data/themes are
removed.
* Thu Dec 25 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1451
- Remove icons maybe under non-free copyright/license from Cairo-Penguin plugin
(need ask)
* Sat Dec 20 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1444
- Support xfce plugin again because dependency on hal-devel
is resoved
* Wed Dec 17 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- Trial fix to compile motion-blur plugin on rev 1439
* Sun Dec 7 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1429
- Try 2.0.0 development branch
- Build weblet plugin with WebKit, switching from Gecko,
rename weblet related plugin
- Disable xfce related plugin for now until hal-devel is properly
rebuilt
* Wed Nov 12 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.3.1-1
- 1.6.3.1
* Wed Nov 5 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.3-1
- 1.6.3
* Wed Oct 29 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.3-0.3.rc2
- 1.6.3 rc2
* Tue Oct 28 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.3-0.3.rc1
- 1.6.3 rc1
* Thu Oct 16 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.3-0.2.svn1353_trunk
- GMenu plugin needs gnome-menus-devel
* Wed Sep 24 2008 Christopher Aillon <caillon(a)redhat.com> - 1.6.2.3-1.1
- Rebuild against newer gecko (F-9/8)
* Tue Sep 9 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2.3-1
- 1.6.2.3
* Thu Sep 4 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2.2-1
- 1.6.2.2
* Sat Aug 30 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2.1-1
- 1.6.2.1
* Thu Aug 28 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2-1
- 1.6.2
* Tue Aug 26 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2-0.6.RC4
- 1.6.2 RC4
- Temporary fix for stack/ plugin
* Sat Aug 23 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2-0.3.RC2
- 1.6.2 RC2
* Sun Aug 10 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2-0.2.svn1235_trunk
- Enable unstable plugins again
* Sun Aug 10 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.2-0.1.svn1235_trunk
- Patch to fix infinite loop of function call (this patch is needed
for rev. 1235 and the released 1.6.1.2)
(Fixed in svn 1241)
* Sat Aug 9 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- Build only stable plug-ins for now
* Thu Jul 17 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.1.2-1
- 1.6.1.2
* Tue Jul 15 2008 Christopher Aillon <caillon(a)redhat.com>
- F-8: Rebuild against newer gecko
* Tue Jul 15 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.1.1-1
- 1.6.1.1
* Thu Jul 3 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- F-8: rebuild against new gecko
* Sat Jun 21 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.0.2-1.date20080621
- 1.6.0.2
* Fri Jun 20 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.0.1-2.date20080619
- Revert XCompositeRedirectSubwindows() part in
cairo-dock-X-utilities.c - fixed in rev. 1142
* Thu Jun 19 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.0.1-1.date20080619
- 1.6.0.1
* Wed Jun 11 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.0-0.2.svn1089_trunk
- Fix possibly unsafe tmpfile creation
* Thu Jun 5 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.6.0-0.1.svn1080_trunk
- Prepare for using unified configure script on plug-ins directory
- Install desktop icon
* Wed May 27 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.6-1.date20080528
- 1.5.6
* Sat May 17 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.5.4-5.svn990_trunk
- Update to svn 990
- 2 issues fixed in upstream
* plug-in directory moved to %%_libdir/%%name
* %%name.pc fixed
* Sat May 17 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.5.4-4.date20080506
- F-10: don't build weblets plugin until xulrunner BR dependency is solved
* Sat May 17 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.5.4-3.date20080506
- Misc cleanup
- Remove template, upstream says this is not needed
* Sun May 11 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.5.4-2.date20080506
- Remove mail plug-in for now as there is license conflict
- Enable weblet plug-in
* Fri May 9 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.5.4-1.date20080506
- 1.5.5.4
* Thu May 1 2008 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.5.5.3-1.date20080501
- Initial packaging
- remove Ubuntu related themes
- plugin dir is moved to %%_libdir/%%name/plug-in
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 21 Apr 2009 17:57:54 -0000 1.1
+++ .cvsignore 21 Apr 2009 18:38:20 -0000 1.2
@@ -0,0 +1,3 @@
+cairo-dock-2.0.0-rc3.tar.bz2
+cairo-dock-plugins-2.0.0-rc3-modified.tar.bz2
+cairo-dock-2.0.0-rc3-missing-files.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 21 Apr 2009 17:57:54 -0000 1.1
+++ sources 21 Apr 2009 18:38:20 -0000 1.2
@@ -0,0 +1,3 @@
+e2c9aa78fb96bb0b6330f707cea5bad4 cairo-dock-2.0.0-rc3.tar.bz2
+d59b00692f7ed5428d1c511474915b19 cairo-dock-plugins-2.0.0-rc3-modified.tar.bz2
+661f7cc29662986d2bdf5521ed899585 cairo-dock-2.0.0-rc3-missing-files.tar.bz2
15 years, 7 months
rpms/cairo-dock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvscV9817/rpms/cairo-dock/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module cairo-dock
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: cairo-dock
# $Id: Makefile,v 1.1 2009/04/21 17:57:54 thl Exp $
NAME := cairo-dock
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 7 months
rpms/cairo-dock Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cairo-dock
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvscV9817/rpms/cairo-dock
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module cairo-dock
--- NEW FILE Makefile ---
# Top level Makefile for module cairo-dock
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 7 months
rpms/cairo-dock/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvscV9817/rpms/cairo-dock/devel
Log Message:
Directory /cvs/free/rpms/cairo-dock/devel added to the repository
15 years, 7 months