From a6be633c121730daddc92a17888872edd3c2aaa9eb4b2060940da577df8d6f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 6 Apr 2012 16:10:18 +0000 Subject: [PATCH] Accepting request 112764 from home:aljex Replacement for package jbig-kit to satisfy buildservice vs rpm package naming requirement for Factory. OBS-URL: https://build.opensuse.org/request/show/112764 OBS-URL: https://build.opensuse.org/package/show/graphics/jbigkit?expand=0&rev=1 --- .gitattributes | 23 +++++++ .gitignore | 1 + jbigkit-2.0-shlib.patch | 145 ++++++++++++++++++++++++++++++++++++++++ jbigkit-2.0.tar.gz | 3 + jbigkit.changes | 39 +++++++++++ jbigkit.spec | 97 +++++++++++++++++++++++++++ 6 files changed, 308 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 jbigkit-2.0-shlib.patch create mode 100644 jbigkit-2.0.tar.gz create mode 100644 jbigkit.changes create mode 100644 jbigkit.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/jbigkit-2.0-shlib.patch b/jbigkit-2.0-shlib.patch new file mode 100644 index 0000000..209fe93 --- /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-2.0.tar.gz b/jbigkit-2.0.tar.gz new file mode 100644 index 0000000..d7a5a8b --- /dev/null +++ b/jbigkit-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee +size 435027 diff --git a/jbigkit.changes b/jbigkit.changes new file mode 100644 index 0000000..b4cf162 --- /dev/null +++ b/jbigkit.changes @@ -0,0 +1,39 @@ +------------------------------------------------------------------- +Fri Apr 6 06:25:39 UTC 2012 - brian@aljex.com + +- rpmlint: move *.so to -devel +- rpmlint: move/include/remove doc files in main and lib packages + + +------------------------------------------------------------------- +Fri Apr 6 06:08:17 UTC 2012 - brian@aljex.com + +- renamed buildservice package name from jbig-kit to jbigkit to match rpm package name and source tar/directory to satisfy Factory +- renamed jbigkit-libs package to libjbig +- renamed jbigkit-devel to libjbig-devel + +* Thu Apr 05 2012 Brian K. White +- remove .so's from -devel package +- remove never-intended junk from /usr/bin +- fix rpm "Group:" headers (copy tiff/lib/devel) + +* Sun Jan 03 2010 Brian K. White +- copied from FC11 for openSUSE (11.2) to get .so's + +* 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/jbigkit.spec b/jbigkit.spec new file mode 100644 index 0000000..ac77f0a --- /dev/null +++ b/jbigkit.spec @@ -0,0 +1,97 @@ +Name: jbigkit +Version: 2.0 +Release: 1 +Summary: JBIG1 lossless image compression tools +Group: Productivity/Graphics/Convertors +License: GPL +URL: http://www.cl.cam.ac.uk/~mgk25/jbigkit/ +Source0: %{name}-%{version}.tar.gz +Patch0: jbigkit-2.0-shlib.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: make autoconf automake gcc gcc-c++ + +%package -n libjbig +Summary: JBIG1 lossless image compression library +Group: System/Libraries + +%package -n libjbig-devel +Summary: JBIG1 lossless image compression library -- development files +Group: Development/Libraries/C and C++ +Requires: libjbig = %version + +%description -n libjbig +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 -n libjbig-devel +The libjbig-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 -n %name +%patch0 -p1 + +%build +export CFLAGS="%optflags -I../libjbig" CXXFLAGS="%optflags" +%__make %{?_smp_mflags} + +%check +%__make test + +%install +%__install -Dm 0755 libjbig/libjbig.so.%{version} %{buildroot}/%{_libdir}/libjbig.so.%version +%__install -Dm 0755 libjbig/libjbig85.so.%{version} %{buildroot}/%{_libdir}/libjbig85.so.%version +%__ln_s -f libjbig.so.%{version} %{buildroot}/%{_libdir}/libjbig.so +%__ln_s -f libjbig85.so.%{version} %{buildroot}/%{_libdir}/libjbig85.so + +%__install -d %{buildroot}%_includedir +%__install -m 0644 libjbig/jbig*.h %{buildroot}%_includedir + +%__install -d %{buildroot}%_bindir +%__install -m 0755 pbmtools/pbmtojbg %{buildroot}%_bindir +%__install -m 0755 pbmtools/jbgtopbm %{buildroot}%_bindir +%__install -m 0755 pbmtools/pbmtojbg85 %{buildroot}%_bindir +%__install -m 0755 pbmtools/jbgtopbm85 %{buildroot}%_bindir + +%__install -d %{buildroot}%{_mandir}/man1 +%__install -m 0644 pbmtools/*.1 %{buildroot}%{_mandir}/man1 + +%clean +%__rm -rf %buildroot + +%post -n libjbig -p /sbin/ldconfig + +%postun -n libjbig -p /sbin/ldconfig + +%files +%defattr(-,root,root) +%{_bindir}/* +%doc %{_mandir}/man1/* +%doc COPYING ANNOUNCE TODO CHANGES pbmtools/*.txt + +%files -n libjbig +%defattr(-,root,root) +%{_libdir}/*.so.* +%doc COPYING ANNOUNCE TODO CHANGES libjbig/*.txt + +%files -n libjbig-devel +%defattr(-,root,root) +%{_libdir}/*.so +%{_includedir}/jbig*.h + +%changelog