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

Avoid multilib conflicts

Browse Source
This commit is contained in:
Matthias Clasen 2007-02-05 03:15:57 +00:00
parent 7f2f13fdad
commit 56cb56da1e
3 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libexif-0.6.13-dont-build-docs.patch Normal file
View File

@ -0,0 +1,54 @@
--- libexif-0.6.13/doc/Makefile.dont-build-docs 2007-01-16 12:07:31.000000000 -0500
+++ libexif-0.6.13/doc/Makefile 2007-01-25 15:25:05.000000000 -0500
@@ -204,7 +204,7 @@
EXTRA_DIST = Doxyfile.in Doxyfile-internals.in README.apidocs $(HTML_APIDOC_DIR).tar.gz
doc_DATA = $(DOXYGEN_FILES) README.apidocs
CLEANFILES = $(DOXYGEN_FILES) $(DOXYGEN_STAMPS)
-all: all-am
+all:
.SUFFIXES:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -442,7 +442,7 @@
rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/internals/
ssh "sf" "find /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)"
-all-local: $(DOXYGEN_STAMPS)
+all-local:
install-data-local: install-apidocs install-apidocs-internals
--- libexif-0.6.13/doc/Makefile.in.dont-build-docs 2005-12-27 16:18:36.000000000 -0500
+++ libexif-0.6.13/doc/Makefile.in 2007-01-25 15:31:12.000000000 -0500
@@ -204,7 +204,7 @@
EXTRA_DIST = Doxyfile.in Doxyfile-internals.in README.apidocs $(HTML_APIDOC_DIR).tar.gz
doc_DATA = $(DOXYGEN_FILES) README.apidocs
CLEANFILES = $(DOXYGEN_FILES) $(DOXYGEN_STAMPS)
-all: all-am
+all:
.SUFFIXES:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -415,11 +415,11 @@
@HAVE_DOXYGEN_TRUE@$(HTML_APIDOC_INTERNALS_DIR).tar.gz: $(DOXYGEN_OUTPUT_DIR).stamp
@HAVE_DOXYGEN_TRUE@ (cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_INTERNALS_DIR) | GZIP=--best gzip -c) > $@
-@HAVE_DOXYGEN_TRUE@install-apidocs-internals: $(HTML_APIDOC_INTERNALS_DIR).stamp
+@HAVE_DOXYGEN_TRUE@install-apidocs-internals:
@HAVE_DOXYGEN_TRUE@ $(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)
@HAVE_DOXYGEN_TRUE@ $(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)/
-@HAVE_DOXYGEN_TRUE@install-apidocs: $(HTML_APIDOC_DIR).stamp
+@HAVE_DOXYGEN_TRUE@install-apidocs:
@HAVE_DOXYGEN_TRUE@ $(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)
@HAVE_DOXYGEN_TRUE@ $(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)/
@@ -442,7 +442,7 @@
@HAVE_DOXYGEN_TRUE@ rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/internals/
@HAVE_DOXYGEN_TRUE@ ssh "sf" "find /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)"
-all-local: $(DOXYGEN_STAMPS)
+all-local:
install-data-local: install-apidocs install-apidocs-internals

9
libexif.spec
View File

@ -6,6 +6,8 @@ Group: System Environment/Libraries
License: LGPL
URL: http://libexif.sourceforge.net/
Source0: libexif-%{version}.tar.bz2
Source1: libexif-docs.tar.gz
Patch0: libexif-0.6.13-dont-build-docs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
@ -26,9 +28,13 @@ for writing programs that use libexif.
%prep
%setup -q
# to avoid multilib conflicts, we toss in pre-generated docs
# and neuter make all in the docs dir
tar xzf %{SOURCE1}
%patch0 -p1 -b .dont-build-docs
%build
%configure --disable-static
%configure --disable-static --disable-docs
make %{?_smp_mflags}
%install
@ -63,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Feb 4 2007 Matthias Clasen <mclasen@redhat.com> - 0.6.13-3
- Package review cleanups
- Avoid multilib conflicts by using pregenerated docs
* Wed Jul 26 2006 Matthias Clasen <mclasen@redhat.com> - 0.6.13-2
- Rebuild

1
sources
View File

@ -1 +1,2 @@
1b1e2b495c5aa20c08725f30545a110b libexif-0.6.13.tar.bz2
399f3bdeb9b24275a33347e7208827b9 libexif-docs.tar.gz