diff --git a/.gitignore b/.gitignore index e69de29..5012cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/jbigkit-2.0.tar.gz diff --git a/jbigkit-2.0-shlib.patch b/jbigkit-2.0-shlib.patch new file mode 100644 index 0000000..8d1eaed --- /dev/null +++ b/jbigkit-2.0-shlib.patch @@ -0,0 +1,145 @@ +--- jbigkit/pbmtools/Makefile.shlib 2008-08-25 23:26:39.000000000 +0100 ++++ jbigkit/pbmtools/Makefile 2008-09-03 16:41:20.000000000 +0100 +@@ -5,23 +5,23 @@ + CC = gcc + + # Options for the compiler +-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage ++CFLAGS ?= -g -Wall -ansi -pedantic -I../libjbig # --coverage + + .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:40:43.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) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $^ ++ ++libjbig85.so.$(VERSION): jbig85.o jbig_ar.o ++ $(CC) $(CFLAGS) -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:40:43.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 diff --git a/jbigkit.spec b/jbigkit.spec new file mode 100644 index 0000000..5ccb54d --- /dev/null +++ b/jbigkit.spec @@ -0,0 +1,118 @@ +Name: jbigkit +Version: 2.0 +Release: 6%{?dist} +Summary: JBIG1 lossless image compression tools + +Group: Development/Libraries +License: GPLv2+ +URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/ +Source0: http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-%{version}.tar.gz +Patch0: jbigkit-2.0-shlib.patch + +%package libs +Summary: JBIG1 lossless image compression library +Group: Development/Libraries + +%package devel +Summary: JBIG1 lossless image compression library -- development files +Group: Development/Libraries +Requires: jbigkit-libs%{?_isa} = %{version}-%{release} + +%description libs +JBIG-KIT provides a portable library of compression and decompression +functions with a documented interface that you can include very easily +into your image or document processing software. In addition, JBIG-KIT +provides ready-to-use compression and decompression programs with a +simple command line interface (similar to the converters found in netpbm). + +JBIG-KIT implements the specification: + ISO/IEC 11544:1993 and ITU-T Recommendation T.82(1993): + Information technology — Coded representation of picture and audio + information — Progressive bi-level image compression + +which is commonly referred to as the “JBIG1 standard” + +%description devel +The jbigkit-devel package contains files needed for development using +the JBIG-KIT image compression library. + +%description +The jbigkit package contains tools for converting between PBM and JBIG1 +formats. + + +%prep +%setup -q -n jbigkit +%patch0 -p1 -b .shlib + +%build +make %{?_smp_mflags} CCFLAGS="$RPM_OPT_FLAGS" + +%install +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mkdir -p $RPM_BUILD_ROOT%{_includedir} +mkdir -p $RPM_BUILD_ROOT%{_bindir} +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 -m0644 libjbig/jbig_ar.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 + +%check +make test + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%{_bindir}/???to* +%{_mandir}/man1/* +%doc COPYING + +%files libs +%{_libdir}/libjbig*.so.%{version} +%doc COPYING ANNOUNCE TODO CHANGES + +%files devel +%{_libdir}/libjbig*.so +%{_includedir}/jbig*.h + +%changelog +* Mon Apr 16 2012 Jiri Popelka - 2.0-6 +- Don't install up-to-date license file, use the upstream one. (#807760) + +* Wed Mar 28 2012 Jiri Popelka - 2.0-5 +- Moving from rpmfusion-free to Fedora because it will be free of known patents + in all countries from 2012-04-04 onwards +- Changed license from GPL to GPLv2+ and included up-to-date license file + +* Wed Feb 08 2012 Nicolas Chauvet - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Mar 29 2009 Thorsten Leemhuis - 2.0-3 +- rebuild for new F11 features + +* Fri Sep 05 2008 David Woodhouse 2.0-2 +- Add missing jbig_ar.h + +* Wed Sep 03 2008 David Woodhouse 2.0-1 +- Update to 2.0 + +* Sun Aug 03 2008 Thorsten Leemhuis - 1.6-3 +- rebuild + +* Sun Oct 1 2006 David Woodhouse 1.6-2 +- Review fixes + +* Tue Sep 12 2006 David Woodhouse 1.6-1 +- Initial version diff --git a/sources b/sources index e69de29..a324275 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +3dd87f605abb1a97a22dc79d8b3e8f6c jbigkit-2.0.tar.gz