commit 12898a66534f21916a7b0995dcb361e7f199c650
Author: Elan Ruusamäe <[email protected]>
Date: Fri Mar 20 21:33:26 2015 +0200
add libgnomecups-lpoptions.patch
libgnomecups-lpoptions.patch | 15 +++++++++++++++
libgnomecups.spec | 10 ++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/libgnomecups.spec b/libgnomecups.spec
index 0fc8141..d39dd84 100644
--- a/libgnomecups.spec
+++ b/libgnomecups.spec
@@ -5,10 +5,11 @@ Version: 0.2.3
Release: 3
License: LGPL v2
Group: Libraries
-Source0:
http://ftp.gnome.org/pub/gnome/sources/libgnomecups/0.2/%{name}-%{version}.tar.bz2
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/libgnomecups/0.2/%{name}-%{version}.tar.bz2
# Source0-md5: dc4920c15c9f886f73ea74fbff0ae48b
Patch0: %{name}-glib.patch
Patch1: %{name}-format.patch
+Patch2: %{name}-lpoptions.patch
URL: http://www.gnome.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -60,6 +61,7 @@ Statyczna biblioteka libgnomecups.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -72,11 +74,11 @@ Statyczna biblioteka libgnomecups.
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} install \
+ INSTALL="install -p" \
DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{sr@Latn,sr@latin}
+mv -f $RPM_BUILD_ROOT%{_localedir}/{sr@Latn,sr@latin}
%find_lang %{name}
@@ -88,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS
+%doc AUTHORS ChangeLog NEWS
%attr(755,root,root) %{_libdir}/libgnomecups-1.0.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgnomecups-1.0.so.1
diff --git a/libgnomecups-lpoptions.patch b/libgnomecups-lpoptions.patch
new file mode 100644
index 0000000..7412a1a
--- /dev/null
+++ b/libgnomecups-lpoptions.patch
@@ -0,0 +1,15 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=520449
+
+--- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c
++++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c
+@@ -510,6 +510,10 @@
+ num_dests = cups_get_dests (filename, num_dests, dests);
+ g_free (filename);
+
++ filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions",
NULL);
++ num_dests = cups_get_dests (filename, num_dests, dests);
++ g_free (filename);
++
+ return num_dests;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgnomecups.git/commitdiff/12898a66534f21916a7b0995dcb361e7f199c650
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
