packages: jbigkit/jbigkit-shared.patch, jbigkit/jbigkit.spec, jbigkit/jbigk...

qboosh qboosh at pld-linux.org
Sat Mar 20 15:13:14 CET 2010 

Author: qboosh                       Date: Sat Mar 20 14:13:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.0 (soname changed: ABI break of few functions)
- updated shared patch (with Makefiles patch merged in)
- added pl.po

---- Files affected:
packages/jbigkit:
   jbigkit-shared.patch (1.5 -> 1.6) , jbigkit.spec (1.31 -> 1.32) , jbigkit.pl.po (NONE -> 1.1)  (NEW), jbigkit-Makefiles.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/jbigkit/jbigkit-shared.patch
diff -u packages/jbigkit/jbigkit-shared.patch:1.5 packages/jbigkit/jbigkit-shared.patch:1.6
--- packages/jbigkit/jbigkit-shared.patch:1.5	Sun Jul  4 23:08:45 2004
+++ packages/jbigkit/jbigkit-shared.patch	Sat Mar 20 15:13:05 2010
@@ -1,79 +1,154 @@
-diff -Nur jbigkit.orig/Makefile jbigkit/Makefile
---- jbigkit.orig/Makefile	Tue Apr  9 12:37:13 2002
-+++ jbigkit/Makefile	Fri Jan 17 18:56:43 2003
-@@ -25,6 +25,11 @@
- 	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
- 	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+--- jbigkit/libjbig/Makefile.orig	2008-08-30 19:20:52.000000000 +0200
++++ jbigkit/libjbig/Makefile	2010-03-20 13:27:12.610721140 +0100
+@@ -4,10 +4,11 @@
+ # Select an ANSI/ISO C compiler here, GNU gcc is recommended
+ CC = gcc
  
-+install:
-+	install -d $(DESTDIR)/usr/{bin,lib,include,share/man/man1}
-+	(cd libjbig;  make "DESTDIR=$(DESTDIR)" install)
-+	(cd pbmtools; make "DESTDIR=$(DESTDIR)" install)
-+
- clean:
- 	rm -f *~ core
- 	(cd libjbig; make clean)
-diff -Nur jbigkit.orig/libjbig/Makefile jbigkit/libjbig/Makefile
---- jbigkit.orig/libjbig/Makefile	Tue Feb 13 19:09:24 2001
-+++ jbigkit/libjbig/Makefile	Fri Jan 17 19:04:29 2003
-@@ -7,18 +7,23 @@
- # Options for the compiler: A high optimization level is suggested
- CFLAGS = -O -Wall -ansi -pedantic
- 
--all: libjbig.a tstcodec
-+all: libjbig.la tstcodec
- 
- tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
- 	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
- 	jbig_tab.o
+-# Options for the compiler: A high optimization level is suggested
+-CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
  
--libjbig.a: jbig.o jbig_tab.o
--	rm -f libjbig.a
--	ar rc libjbig.a jbig.o jbig_tab.o
--	-ranlib libjbig.a
+-all: libjbig.a tstcodec tstcodec85
++all: libjbig.la libjbig85.la tstcodec tstcodec85
++
 +%.lo: %.c
 +	libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -c $*.c
  
--jbig.o: jbig.c jbig.h
-+libjbig.la: jbig.lo jbig_tab.lo
-+	libtool --mode=link --tag=CC $(CC) -o libjbig.la jbig.lo jbig_tab.lo -rpath /usr/lib
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+ 	$(CC) $(CFLAGS) -o tstcodec $+
+@@ -15,22 +16,23 @@
+ tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
+ 	$(CC) $(CFLAGS) -o tstcodec85 $+
+ 
+-libjbig.a: jbig.o jbig_ar.o
+-	rm -f libjbig.a
+-	ar rc libjbig.a jbig.o jbig_ar.o
+-	-ranlib libjbig.a
+-
+-libjbig85.a: jbig85.o jbig_ar.o
+-	rm -f libjbig85.a
+-	ar rc libjbig85.a jbig85.o jbig_ar.o
+-	-ranlib libjbig85.a
+-
+-jbig.o: jbig.c jbig.h jbig_ar.h
+-jbig85.o: jbig85.c jbig85.h jbig_ar.h
+-jbig_ar.o: jbig_ar.c jbig_ar.h
++libjbig.la: jbig.lo jbig_ar.lo
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath $(libdir) -version-info 2:0:0
 +
-+jbig.lo: jbig.c jbig.h
++libjbig85.la: jbig85.lo jbig_ar.lo
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ -rpath $(libdir) -version-info 2:0:0
 +
++jbig.lo: jbig.c jbig.h jbig_ar.h
++jbig85.lo: jbig85.c jbig85.h jbig_ar.h
++jbig_ar.lo: jbig_ar.c jbig_ar.h
+ tstcodec.o: tstcodec.c jbig.h
+ tstcodec85.o: tstcodec85.c jbig85.h
+ 
 +install:
-+	libtool --mode=install install libjbig.la $(DESTDIR)/usr/lib
-+	install jbig.h $(DESTDIR)/usr/include
++	libtool --mode=install install libjbig.la $(DESTDIR)$(libdir)
++	libtool --mode=install install libjbig85.la $(DESTDIR)$(libdir)
++	install -m644 jbig.h jbig85.h $(DESTDIR)$(includedir)
++
+ jbig.pot: jbig.c
+ 	xgettext -o$@ -k_ \
+ 	  --copyright-holder='Markus Kuhn' \
+--- jbigkit/pbmtools/Makefile.orig	2008-08-26 00:26:39.000000000 +0200
++++ jbigkit/pbmtools/Makefile	2010-03-20 13:23:22.094704379 +0100
+@@ -5,37 +5,41 @@
+ CC = gcc
+ 
+ # Options for the compiler
+-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
++CPPFLAGS = -I../libjbig
  
- test: tstcodec
- 	./tstcodec
-diff -Nur jbigkit.orig/pbmtools/Makefile jbigkit/pbmtools/Makefile
---- jbigkit.orig/pbmtools/Makefile	Sat Mar 23 02:38:51 2002
-+++ jbigkit/pbmtools/Makefile	Fri Jan 17 19:09:18 2003
-@@ -11,17 +11,21 @@
+ .SUFFIXES: .1 .5 .txt $(SUFFIXES)
  
- all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
+ all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
+ 	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
  
 -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 -	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 +pbmtojbg: pbmtojbg.o ../libjbig/libjbig.la
-+	libtool --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o ../libjbig/libjbig.la
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o pbmtojbg pbmtojbg.o ../libjbig/libjbig.la
  
 -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
 -	$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
 +jbgtopbm: jbgtopbm.o ../libjbig/libjbig.la
-+	libtool --mode=link --tag=CC $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o ../libjbig/libjbig.la
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o jbgtopbm jbgtopbm.o ../libjbig/libjbig.la
+ 
+-pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
+-	$(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
++pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.la
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o ../libjbig/libjbig85.la
+ 
+-jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
+-	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
++jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.la
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o ../libjbig/libjbig85.la
  
  jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
  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.la: ../libjbig/jbig.c ../libjbig/jbig.h \
+ 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
+-	make -C ../libjbig libjbig.a
++	make -C ../libjbig libjbig.la
+ 
+-../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
++../libjbig/libjbig85.la: ../libjbig/jbig85.c ../libjbig/jbig85.h \
+ 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
+-	make -C ../libjbig libjbig85.a
++	make -C ../libjbig libjbig85.la
++
++install:
++	libtool --mode=install install pbmtojbg jbgtopbm $(DESTDIR)$(bindir)
++	install pbmtojbg.1 jbgtopbm.1 $(DESTDIR)$(mandir)/man1
+ 
+ test: test82 test85
  
--../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h
--	cd ../libjbig ; make libjbig.a
-+../libjbig/libjbig.la: ../libjbig/jbig.c ../libjbig/jbig.h
-+	cd ../libjbig ; make libjbig.la
+--- jbigkit/Makefile.orig	2010-03-20 13:23:31.746709407 +0100
++++ jbigkit/Makefile	2010-03-20 13:26:52.578704379 +0100
+@@ -12,23 +12,34 @@
+ 
+ VERSION=2.0
+ 
++prefix=/usr/local
++libdir=$(prefix)/lib
++includedir=$(prefix)/include
++bindir=$(prefix)/bin
++mandir=$(prefix)/share/man
++
+ 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 "libdir=$(libdir)"
+ 
+ pbm: lib
+-	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
++	$(MAKE) -C pbmtools "bindir=$(bindir)" "mandir=$(mandir)"
+ 
+ test: lib pbm
+-	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+-	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
++	$(MAKE) -C libjbig test
++	$(MAKE) -C pbmtools test
 +
 +install:
-+	libtool --mode=install install pbmtojbg jbgtopbm $(DESTDIR)/usr/bin
-+	install pbmtojbg.1 jbgtopbm.1 $(DESTDIR)/usr/share/man/man1
++	install -d $(DESTDIR)/usr/{bin,lib,include,share/man/man1}
++	$(MAKE) -C libjbig install "DESTDIR=$(DESTDIR)" "libdir=$(libdir)" "includedir=$(includedir)"
++	$(MAKE) -C pbmtools install "DESTDIR=$(DESTDIR)" "bindir=$(bindir)" "mandir=$(mandir)"
+ 
+ clean:
+ 	rm -f *~ core
+-	(cd libjbig; make clean)
+-	(cd pbmtools; make clean)
++	$(MAKE) -C libjbig clean
++	$(MAKE) -C pbmtools clean
  
- test: pbmtojbg jbgtopbm
- 	make IMG=ccitt1  OPTIONSJ=      OPTIONSP=      dotest1
+ distribution: clean
+ 	rm -f libjbig/libjbig*.a

================================================================
Index: packages/jbigkit/jbigkit.spec
diff -u packages/jbigkit/jbigkit.spec:1.31 packages/jbigkit/jbigkit.spec:1.32
--- packages/jbigkit/jbigkit.spec:1.31	Mon Jul 28 01:06:59 2008
+++ packages/jbigkit/jbigkit.spec	Sat Mar 20 15:13:06 2010
@@ -6,16 +6,17 @@
 Summary:	JBIG-KIT lossless image compression library
 Summary(pl.UTF-8):	JBIG-KIT - biblioteka do bezstratnej kompresji obrazków
 Name:		jbigkit
-Version:	1.6
-Release:	5
-License:	GPL
+Version:	2.0
+Release:	1
+License:	GPL v2+
 Group:		Libraries
 Source0:	http://www.cl.cam.ac.uk/~mgk25/download/%{name}-%{version}.tar.gz
-# Source0-md5:	ce196e45f293d40ba76af3dc981ccfd7
+# Source0-md5:	3dd87f605abb1a97a22dc79d8b3e8f6c
+Source1:	%{name}.pl.po
 Patch0:		%{name}-shared.patch
-Patch1:		%{name}-Makefiles.patch
 URL:		http://www.cl.cam.ac.uk/~mgk25/jbigkit/
-BuildRequires:	libtool >= 2:1.4e
+BuildRequires:	gettext-devel
+BuildRequires:	libtool >= 2:1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,13 +69,20 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
+
+cp %{SOURCE1} libjbig/po/pl.po
 
 %build
 %{__make} \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}" \
 	prefix=%{_prefix} \
-	libdir=%{_libdir} \
-	CFLAGS="%{rpmcflags}"
+	libdir=%{_libdir}
+
+for l in libjbig/po/*.po ; do
+	msgfmt -c -v -o "${l%.po}.mo" "$l"
+done
 
 %{?with_tests:%{__make} test}
 
@@ -82,9 +90,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	prefix=%{_prefix} \
-	libdir=%{_libdir} \
-	DESTDIR=$RPM_BUILD_ROOT
+	libdir=%{_libdir}
+
+for l in libjbig/po/*.mo ; do
+	install -D "$l" "$RPM_BUILD_ROOT%{_datadir}/locale/$(basename $l .mo)/LC_MESSAGES/jbig.mo"
+done
+
+%find_lang jbig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,27 +106,36 @@
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f jbig.lang
 %defattr(644,root,root,755)
 # INSTALL is about "installing and using" jbigkit
 %doc ANNOUNCE CHANGES INSTALL TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libjbig.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjbig.so.2
+%attr(755,root,root) %{_libdir}/libjbig85.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjbig85.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%doc libjbig/jbig.doc
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
+%doc libjbig/{jbig,jbig85}.txt
+%attr(755,root,root) %{_libdir}/libjbig.so
+%attr(755,root,root) %{_libdir}/libjbig85.so
+%{_libdir}/libjbig.la
+%{_libdir}/libjbig85.la
+%{_includedir}/jbig.h
+%{_includedir}/jbig85.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libjbig.a
+%{_libdir}/libjbig85.a
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/jbgtopbm
+%attr(755,root,root) %{_bindir}/pbmtojbg
+%{_mandir}/man1/jbgtopbm.1*
+%{_mandir}/man1/pbmtojbg.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -120,6 +143,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/03/20 14:13:06  qboosh
+- updated to 2.0 (soname changed: ABI break of few functions)
+- updated shared patch (with Makefiles patch merged in)
+- added pl.po
+
 Revision 1.31  2008/07/27 23:06:59  arekm
 - release 5
 

================================================================
Index: packages/jbigkit/jbigkit.pl.po
diff -u /dev/null packages/jbigkit/jbigkit.pl.po:1.1
--- /dev/null	Sat Mar 20 15:13:15 2010
+++ packages/jbigkit/jbigkit.pl.po	Sat Mar 20 15:13:06 2010
@@ -0,0 +1,51 @@
+# Polish translation for jbigkit.
+# This file is distributed under the same license as the jbigkit package.
+# Jakub Bogusz <qboosh at pld-linux.org>, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: jbigkit 2.0\n"
+"Report-Msgid-Bugs-To: http://www.cl.cam.ac.uk/~mgk25/jbigkit/\n"
+"POT-Creation-Date: 2008-08-27 19:54+0100\n"
+"PO-Revision-Date: 2010-03-20 14:09+0100\n"
+"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
+"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: jbig.c:110
+msgid "All OK"
+msgstr "Poprawnie"
+
+#: jbig.c:111
+msgid "Reached specified image size"
+msgstr "Osiągnięto określony rozmiar obrazu"
+
+#: jbig.c:112
+msgid "Unexpected end of input data stream"
+msgstr "Nieoczekiwany koniec strumienia danych wejściowych"
+
+#: jbig.c:113
+msgid "Not enough memory available"
+msgstr "Zbyt mało dostępnej pamięci"
+
+#: jbig.c:114
+msgid "ABORT marker segment encountered"
+msgstr "Napotkano segment znacznika ABORT"
+
+#: jbig.c:115
+msgid "Unknown marker segment encountered"
+msgstr "Napotkano segment nieznanego znacznika"
+
+#: jbig.c:116
+msgid "Input data stream contains invalid data"
+msgstr "Strumień danych wejściowych zawiera błędne dane"
+
+#: jbig.c:117
+msgid "Input data stream uses unimplemented JBIG features"
+msgstr "Strumień danych wejściowych korzysta z niezaimplementowanych cech JBIG"
+
+#: jbig.c:118
+msgid "Incremental BIE does not continue previous one"
+msgstr "Przyrostowe dane obrazu nie są kontynuacją poprzednich"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jbigkit/jbigkit-shared.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jbigkit/jbigkit.spec?r1=1.31&r2=1.32&f=u

More information about the pld-cvs-commit mailing list