Author: dwmw2 Update of /cvs/free/rpms/jbigkit/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15381 Modified Files: .cvsignore jbigkit.spec sources Added Files: jbigkit-2.0-shlib.patch Removed Files: jbigkit-1.6-shlib.patch Log Message: 2.0 jbigkit-2.0-shlib.patch: --- NEW FILE jbigkit-2.0-shlib.patch --- --- jbigkit/pbmtools/Makefile.shlib 2008-08-25 23:26:39.000000000 +0100 +++ jbigkit/pbmtools/Makefile 2008-09-03 16:22:02.000000000 +0100 @@ -10,18 +10,18 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l .SUFFIXES: .1 .5 .txt $(SUFFIXES) all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \ - pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt +# pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a +pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a +jbgtopbm: jbgtopbm.o ../libjbig/libjbig.so $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a +pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.so $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85 -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a +jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.so $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h @@ -29,13 +29,13 @@ pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h -../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \ +../libjbig/libjbig.so: ../libjbig/jbig.c ../libjbig/jbig.h \ ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h - make -C ../libjbig libjbig.a + make -C ../libjbig libjbig.so -../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \ +../libjbig/libjbig85.so: ../libjbig/jbig85.c ../libjbig/jbig85.h \ ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h - make -C ../libjbig libjbig85.a + make -C ../libjbig libjbig85.so test: test82 test85 --- jbigkit/libjbig/Makefile.shlib 2008-08-30 18:20:52.000000000 +0100 +++ jbigkit/libjbig/Makefile 2008-09-03 16:22:02.000000000 +0100 @@ -5,25 +5,27 @@ CC = gcc # Options for the compiler: A high optimization level is suggested -CFLAGS = -g -O -Wall -ansi -pedantic # --coverage +CFLAGS ?= -g -O -Wall -ansi -pedantic # --coverage +PICFLAGS := -fPIC -DPIC -all: libjbig.a tstcodec tstcodec85 +all: libjbig.so.$(VERSION) tstcodec tstcodec85 -tstcodec: tstcodec.o jbig.o jbig_ar.o - $(CC) $(CFLAGS) -o tstcodec $+ +tstcodec: tstcodec.o libjbig.so + $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig -tstcodec85: tstcodec85.o jbig85.o jbig_ar.o - $(CC) $(CFLAGS) -o tstcodec85 $+ +tstcodec85: tstcodec85.o libjbig85.so + $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig -libjbig.a: jbig.o jbig_ar.o - rm -f libjbig.a - ar rc libjbig.a jbig.o jbig_ar.o - -ranlib libjbig.a +%.so: %.so.$(VERSION) + ln -sf $< $@ -libjbig85.a: jbig85.o jbig_ar.o - rm -f libjbig85.a - ar rc libjbig85.a jbig85.o jbig_ar.o - -ranlib libjbig85.a +libjbig.so.$(VERSION): jbig.o jbig_ar.o + $(CC) -shared -Wl,-soname,$@ -o $@ $^ + +libjbig85.so.$(VERSION): jbig85.o jbig_ar.o + $(CC) -shared -Wl,-soname,$@ -o $@ $^ + +jbig.o jbig85.o jbig_ar.o: CFLAGS += $(PICFLAGS) jbig.o: jbig.c jbig.h jbig_ar.h jbig85.o: jbig85.c jbig85.h jbig_ar.h @@ -37,12 +39,12 @@ jbig.pot: jbig.c --msgid-bugs-address='http://www.cl.cam.ac.uk/~mgk25/jbigkit/' $+ test: tstcodec tstcodec85 - ./tstcodec - ./tstcodec85 + LD_LIBRARY_PATH=`pwd` ./tstcodec + LD_LIBRARY_PATH=`pwd` ./tstcodec85 t82test.pbm: tstcodec - ./tstcodec $@ + LD_LIBRARY_PATH=`pwd` ./tstcodec $@ clean: rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm - rm -f tstcodec tstcodec85 + rm -f tstcodec tstcodec85 *.so *.so.$(VERSION) --- jbigkit/Makefile.shlib 2008-08-30 21:40:22.000000000 +0100 +++ jbigkit/Makefile 2008-09-03 16:24:10.000000000 +0100 @@ -11,24 +11,25 @@ CCFLAGS = -O2 -W CFLAGS = $(CCFLAGS) -I../libjbig VERSION=2.0 +export VERSION CFLAGS CC all: lib pbm @echo "Enter 'make test' in order to start some automatic tests." lib: - (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") + make -C libjbig pbm: lib - (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") + make -C pbmtools test: lib pbm - (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) - (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) + LD_LIBRARY_PATH=`pwd`/libjbig make -C libjbig test + LD_LIBRARY_PATH=`pwd`/libjbig make -C pbmtools test clean: rm -f *~ core - (cd libjbig; make clean) - (cd pbmtools; make clean) + make -C libjbig clean + make -C pbmtools clean distribution: clean rm -f libjbig/libjbig*.a Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/jbigkit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Aug 2008 12:19:03 -0000 1.2 +++ .cvsignore 3 Sep 2008 15:34:54 -0000 1.3 @@ -1 +1 @@ -jbigkit-1.6.tar.gz +jbigkit-2.0.tar.gz Index: jbigkit.spec =================================================================== RCS file: /cvs/free/rpms/jbigkit/devel/jbigkit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jbigkit.spec 3 Aug 2008 12:20:38 -0000 1.2 +++ jbigkit.spec 3 Sep 2008 15:34:54 -0000 1.3 @@ -1,13 +1,13 @@ Name: jbigkit -Version: 1.6 -Release: 3%{?dist} +Version: 2.0 +Release: 1%{?dist} Summary: JBIG1 lossless image compression tools Group: Applications/Multimedia License: GPL URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/ Source0: http://www.cl.cam.ac.uk/~mgk25/download/%{name}-%{version}.tar.gz -Patch0: jbigkit-1.6-shlib.patch +Patch0: jbigkit-2.0-shlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package libs @@ -59,11 +59,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -p -m0755 libjbig/libjbig.so.%{version} $RPM_BUILD_ROOT/%{_libdir} +install -p -m0755 libjbig/libjbig85.so.%{version} $RPM_BUILD_ROOT/%{_libdir} ln -sf libjbig.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libjbig.so +ln -sf libjbig85.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libjbig85.so install -p -m0644 libjbig/jbig.h $RPM_BUILD_ROOT%{_includedir} +install -p -m0644 libjbig/jbig85.h $RPM_BUILD_ROOT%{_includedir} install -p -m0755 pbmtools/???to??? $RPM_BUILD_ROOT%{_bindir} +install -p -m0755 pbmtools/???to???85 $RPM_BUILD_ROOT%{_bindir} install -p -m0644 pbmtools/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean @@ -78,21 +82,23 @@ %files %defattr(-,root,root,-) -%{_bindir}/???to??? +%{_bindir}/???to* %{_mandir}/man1/* - %files libs -%{_libdir}/libjbig.so.%{version} +%{_libdir}/libjbig*.so.%{version} %doc COPYING ANNOUNCE TODO INSTALL CHANGES %files devel -%{_libdir}/libjbig.so -%{_includedir}/jbig.h - +%{_libdir}/libjbig*.so +%{_includedir}/jbig*.h +# Don't obfuscate email address here, please. %changelog -* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.6-3 +* Wed Sep 03 2008 David Woodhouse <dwmw2(a)infradead.org&gt; 2.0-1 +- Update to 2.0 + +* Sun Aug 03 2008 Thorsten Leemhuis <fedora(a)leemhuis.info&gt; - 1.6-3 - rebuild * Sun Oct 1 2006 David Woodhouse <dwmw2(a)infradead.org&gt; 1.6-2 Index: sources =================================================================== RCS file: /cvs/free/rpms/jbigkit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 12:19:03 -0000 1.2 +++ sources 3 Sep 2008 15:34:54 -0000 1.3 @@ -1 +1 @@ -ce196e45f293d40ba76af3dc981ccfd7 jbigkit-1.6.tar.gz +3dd87f605abb1a97a22dc79d8b3e8f6c jbigkit-2.0.tar.gz --- jbigkit-1.6-shlib.patch DELETED ---