rpms/xsane/F-11 xsane-0.996-no-eula.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 xsane.spec, 1.69, 1.70 xsane-0.995-eula-license-size.patch, 1.1, NONE
Nils Philippsen
nphilipp at fedoraproject.org
Fri Jul 31 12:45:31 UTC 2009
- Previous message (by thread): rpms/xsane/F-10 xsane-0.996-no-eula.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 xsane.spec, 1.61, 1.62 xsane-0.995-eula-license-size.patch, 1.1, NONE
- Next message (by thread): rpms/bigboard/devel bigboard.spec,1.77,1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nphilipp
Update of /cvs/pkgs/rpms/xsane/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16648
Modified Files:
.cvsignore sources xsane.spec
Added Files:
xsane-0.996-no-eula.patch
Removed Files:
xsane-0.995-eula-license-size.patch
Log Message:
- version 0.997
- don't show EULA, mention bugzilla in about dialog (#504344)
- don't own %{_datadir}/applications/ (filesystem package owns it)
- Merge review (#226658):
- convert documentation files to UTF-8
- don't BR: sed
- don't own %{_datadir}/applications, %{_sysconfdir}/gimp,
%{_sysconfdir}/gimp/plugins.d
- don't package unnecessary documentation
xsane-0.996-no-eula.patch:
xsane-text.h | 2 ++
xsane.c | 16 ++++++----------
xsane.h | 3 +++
3 files changed, 11 insertions(+), 10 deletions(-)
--- NEW FILE xsane-0.996-no-eula.patch ---
diff -up xsane-0.996/src/xsane.c.no-eula xsane-0.996/src/xsane.c
--- xsane-0.996/src/xsane.c.no-eula 2009-07-21 15:33:00.927455229 +0200
+++ xsane-0.996/src/xsane.c 2009-07-21 15:39:28.661456472 +0200
@@ -3524,10 +3524,13 @@ static void xsane_about_dialog(GtkWidget
snprintf(buf, sizeof(buf), "XSane %s %s\n"
"%s %s\n"
"\n"
+ "%s\n%s"
+ "\n\n"
"%s %s\n"
"%s %s\n",
TEXT_VERSION, XSANE_VERSION,
XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT,
+ TEXT_MODIFIED_BLURB, XSANE_BUGTRACKER_URL,
TEXT_HOMEPAGE, XSANE_HOMEPAGE,
TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
@@ -5714,6 +5717,7 @@ static int xsane_init(int argc, char **a
case 'v': /* --version */
g_print("%s-%s %s %s\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
+ g_print("\n%s\n%s\n\n", TEXT_MODIFIED_BLURB, XSANE_BUGTRACKER_URL);
g_print(" %s %s\n", TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
g_print(" %s %s\n", TEXT_PACKAGE, XSANE_PACKAGE_VERSION);
g_print(" %s%d.%d.%d\n", TEXT_GTK_VERSION, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
@@ -5840,17 +5844,9 @@ static int xsane_init(int argc, char **a
}
- if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
+ if (xsane_pref_restore()) /* restore preferences, returns TRUE if the version is different from the last run */
{
- if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
- {
- DBG(DBG_info, "user did not accept eula, we abort\n");
- return 1; /* User did not accept eula */
- }
- else /* User did accept eula */
- {
- xsane_pref_save();
- }
+ xsane_pref_save();
}
xsane_pref_restore_media();
diff -up xsane-0.996/src/xsane.h.no-eula xsane-0.996/src/xsane.h
--- xsane-0.996/src/xsane.h.no-eula 2009-07-21 15:33:00.921470546 +0200
+++ xsane-0.996/src/xsane.h 2009-07-21 16:08:01.398707123 +0200
@@ -98,6 +98,9 @@
#define XSANE_EMAIL_ADR "Oliver.Rauch at xsane.org"
#define XSANE_HOMEPAGE "http://www.xsane.org"
#define XSANE_COPYRIGHT_TXT XSANE_DATE " " XSANE_COPYRIGHT
+#ifndef XSANE_BUGTRACKER_URL
+#define XSANE_BUGTRACKER_URL "(no bug tracker configured)"
+#endif
/* ---------------------------------------------------------------------------------------------------------------------- */
diff -up xsane-0.996/src/xsane-text.h.no-eula xsane-0.996/src/xsane-text.h
--- xsane-0.996/src/xsane-text.h.no-eula 2007-08-13 09:16:43.000000000 +0200
+++ xsane-0.996/src/xsane-text.h 2009-07-21 15:42:00.609707360 +0200
@@ -230,6 +230,8 @@
"This program is distributed in the hope that it will be useful, but\n" \
"WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
+#define TEXT_MODIFIED_BLURB _("This package is modified from the original version.\n" \
+ "Please contact your vendor or report problems at")
#define TEXT_EMAIL_ADR _("E-mail:")
#define TEXT_HOMEPAGE _("Homepage:")
#define TEXT_FILE _("File:")
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-11/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore 18 Jan 2009 18:31:22 -0000 1.18
+++ .cvsignore 31 Jul 2009 12:45:30 -0000 1.19
@@ -1 +1 @@
-xsane-0.996.tar.gz
+xsane-0.997.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 18 Jan 2009 18:31:22 -0000 1.18
+++ sources 31 Jul 2009 12:45:30 -0000 1.19
@@ -1 +1 @@
-7dcbcdf0e83322d7c0a543672d9ca2d8 xsane-0.996.tar.gz
+8377b3e3b792f3d2b7f13895467c7082 xsane-0.997.tar.gz
Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-11/xsane.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- xsane.spec 3 May 2009 17:41:52 -0000 1.69
+++ xsane.spec 31 Jul 2009 12:45:31 -0000 1.70
@@ -1,15 +1,17 @@
-%define desktop_vendor fedora
+# if you rebuild, please change bugtracker_url accordingly:
+%global bugtracker_url http://bugzilla.redhat.com
+%global desktop_vendor fedora
Name: xsane
Summary: X Window System front-end for the SANE scanner interface
-Version: 0.996
-Release: 7%{?dist}
+Version: 0.997
+Release: 1%{?dist}
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane.desktop
Source2: xsane.conf.in
Patch0: xsane-0.995-xdg-open.patch
-Patch1: xsane-0.995-eula-license-size.patch
-Patch2: xsane-0.995-close-fds.patch
+Patch1: xsane-0.995-close-fds.patch
+Patch2: xsane-0.996-no-eula.patch
License: GPLv2+
URL: http://www.xsane.org/
Group: Applications/Multimedia
@@ -22,7 +24,6 @@ BuildRequires: sane-backends-devel >= 1.
BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: libtiff-devel
BuildRequires: gettext-devel
-BuildRequires: sed
ExcludeArch: s390 s390x
%description
@@ -44,11 +45,21 @@ installed to use this package.
%prep
%setup -q
+
+# convert some files to UTF-8
+for doc in xsane.{CHANGES,PROBLEMS,INSTALL}; do
+ iconv -f ISO-8859-1 -t utf8 "$doc" -o "$doc.new" && \
+ touch -r "$doc" "$doc.new" && \
+ mv "$doc.new" "$doc"
+done
+
%patch0 -p1 -b .xdg-open
-%patch1 -p1 -b .eula-license-size
-%patch2 -p1 -b .close-fds
+%patch1 -p1 -b .close-fds
+%patch2 -p1 -b .no-eula
%build
+CC='gcc -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"'
+export CC
%configure --enable-gimp
make LDFLAGS=
@@ -94,11 +105,10 @@ fi
%files -f XSANE.lang
%defattr(-,root,root)
-%doc xsane.[A-Z]*
+%doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.COPYING xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
%{_bindir}/xsane
%{_mandir}/man1/*
%{_datadir}/sane
-%dir %{_datadir}/applications
%{_datadir}/applications/%{desktop_vendor}-xsane.desktop
%{_datadir}/pixmaps/xsane.xpm
@@ -108,13 +118,32 @@ fi
%dir %{_datadir}/sane
%dir %{_datadir}/sane/xsane
%{_datadir}/sane/xsane/*eula*
-%dir %{_sysconfdir}/gimp
-%dir %{_sysconfdir}/gimp/plugins.d
%config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
%changelog
-* Sun May 03 2009 Warren Togami <wtogami at redhat.com> - 0.996-7
-- rebuild to make it work (gcc miscompile?)
+* Fri Jul 31 2009 Nils Philippsen <nils at redhat.com> 0.997-1
+- version 0.997
+- drop obsolete sane-backends-1.0.20 patch
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.996-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Nils Philippsen <nils at redhat.com> 0.996-9
+- don't show EULA, mention bugzilla in about dialog (#504344)
+
+* Mon Jul 20 2009 Nils Philippsen <nils at redhat.com> 0.996-8
+- don't use obsolete SANE_CAP_ALWAYS_SETTABLE macro (#507823)
+
+* Tue Jul 7 2009 Tom "spot" Callaway <tcallawa at redhat.com> 0.996-7
+- don't own %%{_datadir}/applications/ (filesystem package owns it)
+
+* Fri May 29 2009 Nils Philippsen <nils at redhat.com>
+- Merge review (#226658):
+ - convert documentation files to UTF-8
+ - don't BR: sed
+ - don't own %{_datadir}/applications, %{_sysconfdir}/gimp,
+ %{_sysconfdir}/gimp/plugins.d
+ - don't package unnecessary documentation
* Mon Mar 02 2009 Nils Philippsen <nils at redhat.com> - 0.996-6
- rebuild against new sane-backends (just in case)
@@ -437,9 +466,3 @@ fi
* Thu Apr 22 1999 Preston Brown <pbrown at redhat.com>
- initial RPM for PowerTools 6.0
-
-
-
-
-
-
--- xsane-0.995-eula-license-size.patch DELETED ---
- Previous message (by thread): rpms/xsane/F-10 xsane-0.996-no-eula.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 xsane.spec, 1.61, 1.62 xsane-0.995-eula-license-size.patch, 1.1, NONE
- Next message (by thread): rpms/bigboard/devel bigboard.spec,1.77,1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list