rpms/libgphoto2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix pkgcfg patch to match actual .pc file names (fixes kdegraphics build)

Browse Source 
(Looks like the .pc files created in libgphoto2.spec aren't actually
    installed, use the upstream ones instead. The real problem was that the
    upstream file is named libgphoto2_port.pc, not libgphoto2-port.pc.)
This commit is contained in:
Kevin Kofler 2008-06-20 16:27:59 +00:00
parent e064eb3bef
commit 3608e437f0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gphoto2-pkgcfg.patch
View File

@ -26,12 +26,12 @@
--cflags)
- echo "-I@includedir@/gphoto2"
+ pkg-config --cflags gphoto2
+ pkg-config --cflags libgphoto2
;;
--libs)
- echo "-L@libdir@" -lgphoto2 -lgphoto2_port -lm
+ pkg-config --libs gphoto2
+ pkg-config --libs libgphoto2
;;
*)
@ -63,12 +63,12 @@
--cflags)
- echo "-I@includedir@/gphoto2"
+ pkg-config --cflags gphoto2-port
+ pkg-config --cflags libgphoto2_port
;;
--libs)
- echo "-L@libdir@" -lgphoto2_port
+ pkg-config --libs gphoto2-port
+ pkg-config --libs libgphoto2_port
;;
*)

5
libgphoto2.spec
View File

@ -1,7 +1,7 @@
Summary: Library for accessing digital cameras
Name: libgphoto2
Version: 2.4.1
Release: 4%{?dist}
Release: 5%{?dist}
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2
Group: Development/Libraries
@ -55,6 +55,7 @@ use libgphoto2.
%patch3 -p1 -b .ixany
%patch6 -p1 -b .libusb-build
# FIXME: These .pc.in files aren't actually being installed?
cat > gphoto2.pc.in << \EOF
prefix=@prefix@
exec_prefix=@exec_prefix@
@ -150,7 +151,7 @@ rm -rf "${RPM_BUILD_ROOT}"
%{_mandir}/man3/*
%changelog
* Fri Jun 20 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.4.1-4
* Fri Jun 20 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 2.4.1-5
- fix pkgcfg patch to match actual .pc file names (fixes kdegraphics build)
* Thu Jun 12 2008 Jindrich Novy <jnovy@redhat.com> 2.4.1-3