Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/netpbm-04-pngver.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3029 143d3225a883
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3029
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     1
 
--- netpbm-10.35.77/converter/other/Makefile	2010-11-17 16:26:16.913797412 +0100
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     2
 
+++ netpbm-10.35.77-patch/converter/other/Makefile	2010-11-17 16:26:04.138947911 +0100
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     3
 
@@ -27,7 +27,7 @@
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     4
 
   endif
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     5
 
 endif
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     6
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     7
 
-ifeq ($(shell libpng-config --version),)
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     8
 
+ifeq ($(shell libpng$(PNGVER)-config --version),)
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
     9
 
   ifneq ($(PNGLIB),NONE)
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    10
 
     HAVE_PNGLIB = Y
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    11
 
     ifneq ($(PNGHDR_DIR)x,x)
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    12
 
@@ -39,7 +39,7 @@
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    13
 
   endif
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    14
 
 else
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    15
 
   HAVE_PNGLIB = Y
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    16
 
-  INCLUDES += $(shell libpng-config --cflags)
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    17
 
+  INCLUDES += $(shell libpng$(PNGVER)-config --cflags)
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    18
 
 endif
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    19
143d3225a883 SFEnetpbm.spec: bump to 10.35.77, fix wget download break
jurikm
parents:
diff changeset 
    20
 
 ifneq ($(JPEGLIB),NONE)
upstream/spec-files-extra