rpms/screem/FC-5 fix_miscompile.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 screem.spec, 1.6, 1.7 sources, 1.4, 1.5
Michael J Knox (mjk)
fedora-extras-commits at redhat.com
Tue Apr 25 01:52:06 UTC 2006
Author: mjk
Update of /cvs/extras/rpms/screem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3291
Modified Files:
.cvsignore screem.spec sources
Added Files:
fix_miscompile.patch
Log Message:
updated version and patch to fix miscompile
fix_miscompile.patch:
--- NEW FILE fix_miscompile.patch ---
--- screem-0.16.1/src/screem-main.c.orig 2006-04-25 13:02:00.000000000 +1200
+++ screem-0.16.1/src/screem-main.c 2006-04-25 13:06:58.000000000 +1200
@@ -54,12 +54,23 @@
static gchar *session_filename = SESSION_LAST;
/* passed parameters stuff */
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
static const struct poptOption options[] = {
{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
N_("Load the given session file"),
N_("FILE") },
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
};
+#else /* USE GOption interface */
+static const gchar **remaining_args = NULL;
+static GOptionEntry option_entries[] = {
+ { "load-session", 'l', 0, G_OPTION_ARG_STRING, &(session_filename),
+ N_("Load the given session file"), N_("FILE") },
+ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args,
+ "Special option that collects any remaining arguments for us" },
+ { NULL }
+};
+#endif
typedef enum {
MISSING_GLADE,
@@ -75,8 +86,10 @@
int main( int argc, char *argv[] )
{
GnomeProgram *program;
+ const gchar** start_files;
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
poptContext ctx;
- const gchar** start_files;
+#endif
const gchar *icon;
gchar *dotdir;
@@ -87,12 +100,22 @@
bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
textdomain( GETTEXT_PACKAGE );
-#endif
+#endif
+
+#ifdef GNOME_PARAM_GOPTION_CONTEXT
+ GOptionContext *option_context = g_option_context_new("screem");
+ g_option_context_add_main_entries(option_context, option_entries, NULL);
+#endif
+
program = gnome_program_init( PACKAGE, VERSION,
LIBGNOMEUI_MODULE,
argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
GNOME_PARAM_POPT_TABLE, options,
+#else
+ GNOME_PARAM_GOPTION_CONTEXT, option_context,
+#endif
GNOME_PARAM_APP_DATADIR, DATADIR,
LIBGNOMEUI_PARAM_DEFAULT_ICON,
DATADIR"/pixmaps/screem.png",
@@ -105,10 +128,14 @@
icon = DATADIR"/pixmaps/screem.png";
gtk_window_set_default_icon_from_file( icon, NULL );
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
/* parse arguments */
g_object_get( G_OBJECT( program ),
GNOME_PARAM_POPT_CONTEXT, &ctx, NULL );
start_files = parse_args( ctx, argc, argv );
+#else
+ start_files = remaining_args;
+#endif
gnome_vfs_init();
gnome_authentication_manager_init();
@@ -160,6 +187,7 @@
return FALSE;
}
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
static const gchar **parse_args( poptContext ctx, int argc, char *argv[] )
{
const gchar** start_files;
@@ -169,6 +197,7 @@
return start_files;
}
+#endif
static void screem_main_missing( MissingType type )
{
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 7 Jul 2005 20:57:33 -0000 1.4
+++ .cvsignore 25 Apr 2006 01:52:06 -0000 1.5
@@ -1 +1 @@
-screem-0.14.1.tar.gz
+screem-0.16.1.tar.gz
Index: screem.spec
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/screem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- screem.spec 2 Mar 2006 21:31:43 -0000 1.6
+++ screem.spec 25 Apr 2006 01:52:06 -0000 1.7
@@ -1,12 +1,13 @@
Name: screem
-Version: 0.14.1
+Version: 0.16.1
Release: 1%{?dist}
Summary: Website development environment
Group: Development/Tools
License: GPL
-URL: http://screem.sourceforge.net/
+URL: http://www.screem.org/
Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz
+Patch0: fix_miscompile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -29,7 +30,6 @@
Requires(postun): scrollkeeper
Requires(postun): shared-mime-info
-
%description
SCREEM is a non-WYSIWYG web site development environment with an
advanced editor and easy access to external helper applications such
@@ -40,15 +40,9 @@
parsing, page templates and publishing of files are also supported.
%prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
%setup -q
-
+%patch0 -p1 -b .mjk
%build
%configure \
@@ -58,24 +52,23 @@
--enable-dbus
make %{?_smp_mflags}
-
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DATADIRNAME=${RPM_BUILD_ROOT}%{_datadir} DESTDIR=${RPM_BUILD_ROOT}
+make install DATADIRNAME=%{buildroot}%{_datadir} DESTDIR=%{buildroot}
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
desktop-file-install --delete-original --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
%clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
%post
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -84,18 +77,15 @@
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
scrollkeeper-update -q
-
%preun
export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
-
%postun
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
scrollkeeper-update -q
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING COPYING-DOCS ChangeLog NEWS README TODO
@@ -105,14 +95,18 @@
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/gnome/help/%{name}
%{_datadir}/mime/packages/*
-%{_datadir}/mime-info
%{_datadir}/omf
%{_datadir}/pixmaps/*
%{_libdir}/%{name}
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
%{_sysconfdir}/gconf/schemas/*
-
%changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.16.1-1
+- updated to 0.16.1
+- fix miscompile, patch based on debian bug report #358759
+
* Thu Jul 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.14.1-1
- Update to 0.14.1 (also fixes bug #153224).
- BR gnome-menus-devel libcroco-devel
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 7 Jul 2005 20:57:33 -0000 1.4
+++ sources 25 Apr 2006 01:52:06 -0000 1.5
@@ -1 +1 @@
-b23bf53698df79477f83f3d66b6eab0d screem-0.14.1.tar.gz
+88bfc0afadb905ddbed9bdfbc869602a screem-0.16.1.tar.gz
More information about the fedora-extras-commits
mailing list