diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-05-16 22:28:39 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-05-16 22:28:39 +0000 |
| commit | 1cd94291f71f30cdda8d031cf9efdfe6920b01e3 (patch) | |
| tree | 1c61214f28b76edd6e126cb7ca8320ee3ebe399f /packaging | |
| parent | 395ebf695ebe18329285ac9e17f3724ca4637a1f (diff) | |
| download | libgphoto2-1cd94291f71f30cdda8d031cf9efdfe6920b01e3.tar.gz | |
make libusb support unconditional in sample
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12090 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/Makefile.am | 9 | ||||
| -rw-r--r-- | packaging/rpm/package.spec.in | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am index bbeb1c932..9838dc025 100644 --- a/packaging/rpm/Makefile.am +++ b/packaging/rpm/Makefile.am @@ -15,15 +15,6 @@ clean-local: cp $< $@ rpm: Makefile package.spec -if RPM_LIBUSB_DEVEL - @echo "Building libgphoto2 RPM with USB support and dependency on the libusb RPM package." -else - @echo "#############################################################################" - @echo "# Building libgphoto2 RPM packages ***WITHOUT*** USB support. #" - @echo "# Install both the libusb and the libusb-devel RPM package for USB support. #" - @echo "#############################################################################" - @sleep 3 -endif $(MAKE) clean mkdir -p BUILD SPECS SOURCES SRPMS for arch in i386 i486 i586 i686 alpha noarch; do \ diff --git a/packaging/rpm/package.spec.in b/packaging/rpm/package.spec.in index 1f3541e6a..65767fd98 100644 --- a/packaging/rpm/package.spec.in +++ b/packaging/rpm/package.spec.in @@ -34,8 +34,8 @@ BuildRequires: findutils perl # the following requirements are optional @ENABLE_GTK_DOC_TRUE@BuildRequires: gtk-doc -@RPM_LIBUSB_DEVEL_TRUE@Requires: libusb >= 0.1.8 -@RPM_LIBUSB_DEVEL_TRUE@BuildRequires: libusb-devel >= 0.1.8 +Requires: libusb >= 0.1.8 +BuildRequires: libusb-devel >= 0.1.8 #################################### %description |