rpms/wl-kmod/devel broadcom-wl-5.100.82.112-license.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 wl-kmod.spec, 1.55, 1.56 5_100_82_38.patch, 1.1, NONE broadcom-wl-5.100.82.38-license.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15792
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-license.patch
Removed Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Mon Nov 07 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
broadcom-wl-5.100.82.112-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-license.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2011-10-22 18:55:54.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2011-10-26 09:40:02.793032059 +0200
@@ -185,6 +185,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 5 Nov 2011 00:08:48 -0000 1.10
+++ .cvsignore 6 Nov 2011 23:40:23 -0000 1.11
@@ -1,3 +1,3 @@
-hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
+hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
broadcom-wl-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 5 Nov 2011 00:08:51 -0000 1.11
+++ sources 6 Nov 2011 23:40:24 -0000 1.12
@@ -1,3 +1,3 @@
-cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
+62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- wl-kmod.spec 5 Nov 2011 00:08:51 -0000 1.55
+++ wl-kmod.spec 6 Nov 2011 23:40:24 -0000 1.56
@@ -8,17 +8,16 @@
#define buildforkernels akmods
Name: wl-kmod
-Version: 5.100.82.38
-Release: 1%{?dist}.1
+Version: 5.100.82.112
+Release: 1%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.100.82.38-license.patch
-Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+Patch0: broadcom-wl-5.100.82.112-license.patch
BuildRequires: %{_bindir}/kmodtool
@@ -55,7 +54,6 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
-%patch1 -p0 -b .init_MUTEX
popd
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +83,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Nov 07 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
+- Updated version to 5.100.82.112
+
* Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1.1
- Rebuilt for F-16
--- 5_100_82_38.patch DELETED ---
--- broadcom-wl-5.100.82.38-license.patch DELETED ---
13 years
rpms/broadcom-wl/devel broadcom-wl-5.100.82.112-license.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 broadcom-wl.spec, 1.13, 1.14 sources, 1.11, 1.12 5_100_82_38.patch, 1.1, NONE broadcom-wl-5.100.82.38-license.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14460
Modified Files:
.cvsignore broadcom-wl.spec sources
Added Files:
broadcom-wl-5.100.82.112-license.patch
Removed Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Mon Nov 07 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
broadcom-wl-5.100.82.112-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.112-license.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2011-10-22 18:55:54.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2011-10-26 09:40:02.793032059 +0200
@@ -185,6 +185,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 4 Nov 2011 01:39:31 -0000 1.10
+++ .cvsignore 6 Nov 2011 23:30:21 -0000 1.11
@@ -1,5 +1,5 @@
-hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-README.txt
-bcma.txt
+hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
+hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+broadcom-wl-kmodtool-excludekernel-filterfile
broadcom-wl-blacklist.conf
+README.txt
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/broadcom-wl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- broadcom-wl.spec 4 Nov 2011 23:56:37 -0000 1.13
+++ broadcom-wl.spec 6 Nov 2011 23:30:22 -0000 1.14
@@ -1,17 +1,15 @@
Name: broadcom-wl
-Version: 5.100.82.38
-Release: 1%{?dist}.1
+Version: 5.100.82.112
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
-Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
+Source2: http://www.broadcom.com/docs/linux_sta/README.txt
Source3: broadcom-wl-blacklist.conf
-Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
-Patch0: broadcom-wl-5.100.82.38-license.patch
-Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+Patch0: broadcom-wl-5.100.82.112-license.patch
BuildArch: noarch
Provides: wl-kmod-common = %{version}
@@ -30,10 +28,9 @@
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
-cp -p %{SOURCE2} %{SOURCE4} .
-chmod 644 lib/LICENSE.txt README.txt bcma.txt
+cp -p %{SOURCE2} .
+chmod 644 lib/LICENSE.txt README.txt
%patch0 -p1 -b .license
-%patch1 -p0 -b .init_MUTEX
%build
echo "Nothing to build."
@@ -48,10 +45,13 @@
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt bcma.txt
+%doc lib/LICENSE.txt README.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Mon Nov 07 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
+- Updated version to 5.100.82.112
+
* Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1.1
- Rebuilt for F-16
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Nov 2011 01:39:34 -0000 1.11
+++ sources 6 Nov 2011 23:30:22 -0000 1.12
@@ -1,5 +1,5 @@
-cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-24976921c7b8854ed2cd56fbc5b1c13c README.txt
-521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
+310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
+62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
7b6a8f3ca263a3bb2e49124ade3cf010 broadcom-wl-blacklist.conf
+6fd54aac59a53559d01520f35500693b README.txt
--- 5_100_82_38.patch DELETED ---
--- broadcom-wl-5.100.82.38-license.patch DELETED ---
13 years
rpms/libaacs/EL-5 libaacs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2018/EL-5
Modified Files:
.cvsignore sources
Added Files:
libaacs.spec
Log Message:
Initial import.
--- NEW FILE libaacs.spec ---
%global tarball_date 20111105
%global git_hash 876f45a3f727eb6f06cdb2b0128f857226346e59
%global git_short %(echo '%{git_hash}' | cut -c -13)
Name: libaacs
Version: 0.2
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.videolan.org/developers/libaacs.html
# No release yet. Use the commands below to generate a tarball.
# git clone git://git.videolan.org/libaacs.git
# cd libaacs
# git archive --format=tar %{git_hash} --prefix=libaacs/ | bzip2 > ../libaacs-$( date +%Y%m%d )git%{git_short}.tar.bz2
Source0: %{name}-%{tarball_date}git%{git_short}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
%description
This library is an open implementation of the AACS specification.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q -n %{name}
sed -i -e 's/\r//' KEYDB.cfg
%build
autoreconf -vif
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING KEYDB.cfg README.txt
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libaacs.pc
%changelog
* Sat Nov 05 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.3.20111105git876f45a3f727e
- Update to latest snapshot.
* Tue Sep 27 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.2.20110925gite854d6673ad6c
- Make the devel package require arch-specific base package.
* Sun Sep 25 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.1.20110925gite854d6673ad6c
- Update to latest snapshot.
* Sun Jul 10 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.6.20110710git964342fbf3ed6
- Update to latest snapshot.
* Sun May 15 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.5.20110515git497c22423d0e7
- Update to latest snapshot.
* Fri Jan 07 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.4.20110107gite7aa4fd42c0d4
- Update to latest snapshot.
* Sun Nov 14 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.3.20101114gitfb77542a8f6c7
- Update to latest snapshot.
* Thu Oct 21 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.2.20101021git00b2df2bb7598
- Fix release tag.
- Update to latest snapshot.
* Tue Aug 17 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.1.20100817
- Initial Fedora release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libaacs/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Nov 2011 16:45:44 -0000 1.1
+++ .cvsignore 6 Nov 2011 21:57:15 -0000 1.2
@@ -0,0 +1 @@
+libaacs-20111105git876f45a3f727e.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libaacs/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Nov 2011 16:45:45 -0000 1.1
+++ sources 6 Nov 2011 21:57:15 -0000 1.2
@@ -0,0 +1 @@
+3775106bc921a15040b2df3ee5c3aa43 libaacs-20111105git876f45a3f727e.tar.bz2
13 years
rpms/libaacs/EL-6 libaacs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1804/EL-6
Modified Files:
.cvsignore sources
Added Files:
libaacs.spec
Log Message:
Initial import.
--- NEW FILE libaacs.spec ---
%global tarball_date 20111105
%global git_hash 876f45a3f727eb6f06cdb2b0128f857226346e59
%global git_short %(echo '%{git_hash}' | cut -c -13)
Name: libaacs
Version: 0.2
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.videolan.org/developers/libaacs.html
# No release yet. Use the commands below to generate a tarball.
# git clone git://git.videolan.org/libaacs.git
# cd libaacs
# git archive --format=tar %{git_hash} --prefix=libaacs/ | bzip2 > ../libaacs-$( date +%Y%m%d )git%{git_short}.tar.bz2
Source0: %{name}-%{tarball_date}git%{git_short}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
%description
This library is an open implementation of the AACS specification.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q -n %{name}
sed -i -e 's/\r//' KEYDB.cfg
%build
autoreconf -vif
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING KEYDB.cfg README.txt
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libaacs.pc
%changelog
* Sat Nov 05 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.3.20111105git876f45a3f727e
- Update to latest snapshot.
* Tue Sep 27 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.2.20110925gite854d6673ad6c
- Make the devel package require arch-specific base package.
* Sun Sep 25 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.1.20110925gite854d6673ad6c
- Update to latest snapshot.
* Sun Jul 10 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.6.20110710git964342fbf3ed6
- Update to latest snapshot.
* Sun May 15 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.5.20110515git497c22423d0e7
- Update to latest snapshot.
* Fri Jan 07 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.4.20110107gite7aa4fd42c0d4
- Update to latest snapshot.
* Sun Nov 14 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.3.20101114gitfb77542a8f6c7
- Update to latest snapshot.
* Thu Oct 21 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.2.20101021git00b2df2bb7598
- Fix release tag.
- Update to latest snapshot.
* Tue Aug 17 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.1.20100817
- Initial Fedora release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libaacs/EL-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Nov 2011 16:45:44 -0000 1.1
+++ .cvsignore 6 Nov 2011 21:56:40 -0000 1.2
@@ -0,0 +1 @@
+libaacs-20111105git876f45a3f727e.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libaacs/EL-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Nov 2011 16:45:45 -0000 1.1
+++ sources 6 Nov 2011 21:56:40 -0000 1.2
@@ -0,0 +1 @@
+3775106bc921a15040b2df3ee5c3aa43 libaacs-20111105git876f45a3f727e.tar.bz2
13 years
rpms/libaacs/F-15 libaacs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1020/F-15
Modified Files:
.cvsignore sources
Added Files:
libaacs.spec
Log Message:
Initial import.
--- NEW FILE libaacs.spec ---
%global tarball_date 20111105
%global git_hash 876f45a3f727eb6f06cdb2b0128f857226346e59
%global git_short %(echo '%{git_hash}' | cut -c -13)
Name: libaacs
Version: 0.2
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.videolan.org/developers/libaacs.html
# No release yet. Use the commands below to generate a tarball.
# git clone git://git.videolan.org/libaacs.git
# cd libaacs
# git archive --format=tar %{git_hash} --prefix=libaacs/ | bzip2 > ../libaacs-$( date +%Y%m%d )git%{git_short}.tar.bz2
Source0: %{name}-%{tarball_date}git%{git_short}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
%description
This library is an open implementation of the AACS specification.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q -n %{name}
sed -i -e 's/\r//' KEYDB.cfg
%build
autoreconf -vif
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING KEYDB.cfg README.txt
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libaacs.pc
%changelog
* Sat Nov 05 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.3.20111105git876f45a3f727e
- Update to latest snapshot.
* Tue Sep 27 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.2.20110925gite854d6673ad6c
- Make the devel package require arch-specific base package.
* Sun Sep 25 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.1.20110925gite854d6673ad6c
- Update to latest snapshot.
* Sun Jul 10 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.6.20110710git964342fbf3ed6
- Update to latest snapshot.
* Sun May 15 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.5.20110515git497c22423d0e7
- Update to latest snapshot.
* Fri Jan 07 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.4.20110107gite7aa4fd42c0d4
- Update to latest snapshot.
* Sun Nov 14 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.3.20101114gitfb77542a8f6c7
- Update to latest snapshot.
* Thu Oct 21 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.2.20101021git00b2df2bb7598
- Fix release tag.
- Update to latest snapshot.
* Tue Aug 17 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.1.20100817
- Initial Fedora release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libaacs/F-15/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Nov 2011 16:45:44 -0000 1.1
+++ .cvsignore 6 Nov 2011 21:53:09 -0000 1.2
@@ -0,0 +1 @@
+libaacs-20111105git876f45a3f727e.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libaacs/F-15/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Nov 2011 16:45:45 -0000 1.1
+++ sources 6 Nov 2011 21:53:10 -0000 1.2
@@ -0,0 +1 @@
+3775106bc921a15040b2df3ee5c3aa43 libaacs-20111105git876f45a3f727e.tar.bz2
13 years
rpms/libaacs/devel libaacs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23697/devel
Modified Files:
.cvsignore sources
Added Files:
libaacs.spec
Log Message:
Initial import.
--- NEW FILE libaacs.spec ---
%global tarball_date 20111105
%global git_hash 876f45a3f727eb6f06cdb2b0128f857226346e59
%global git_short %(echo '%{git_hash}' | cut -c -13)
Name: libaacs
Version: 0.2
Release: 0.3.%{tarball_date}git%{git_short}%{?dist}
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.videolan.org/developers/libaacs.html
# No release yet. Use the commands below to generate a tarball.
# git clone git://git.videolan.org/libaacs.git
# cd libaacs
# git archive --format=tar %{git_hash} --prefix=libaacs/ | bzip2 > ../libaacs-$( date +%Y%m%d )git%{git_short}.tar.bz2
Source0: %{name}-%{tarball_date}git%{git_short}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libgcrypt-devel
BuildRequires: flex
BuildRequires: bison
%description
This library is an open implementation of the AACS specification.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q -n %{name}
sed -i -e 's/\r//' KEYDB.cfg
%build
autoreconf -vif
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING KEYDB.cfg README.txt
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libaacs.pc
%changelog
* Sat Nov 05 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.3.20111105git876f45a3f727e
- Update to latest snapshot.
* Tue Sep 27 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.2.20110925gite854d6673ad6c
- Make the devel package require arch-specific base package.
* Sun Sep 25 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.2-0.1.20110925gite854d6673ad6c
- Update to latest snapshot.
* Sun Jul 10 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.6.20110710git964342fbf3ed6
- Update to latest snapshot.
* Sun May 15 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.5.20110515git497c22423d0e7
- Update to latest snapshot.
* Fri Jan 07 2011 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.4.20110107gite7aa4fd42c0d4
- Update to latest snapshot.
* Sun Nov 14 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.3.20101114gitfb77542a8f6c7
- Update to latest snapshot.
* Thu Oct 21 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.2.20101021git00b2df2bb7598
- Fix release tag.
- Update to latest snapshot.
* Tue Aug 17 2010 Xavier Bachelot <xavier(a)bachelot.org> 0.1-0.1.20100817
- Initial Fedora release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Nov 2011 16:45:44 -0000 1.1
+++ .cvsignore 6 Nov 2011 20:39:46 -0000 1.2
@@ -0,0 +1 @@
+libaacs-20111105git876f45a3f727e.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Nov 2011 16:45:45 -0000 1.1
+++ sources 6 Nov 2011 20:39:46 -0000 1.2
@@ -0,0 +1 @@
+3775106bc921a15040b2df3ee5c3aa43 libaacs-20111105git876f45a3f727e.tar.bz2
13 years
rpms/foo2zjs/F-14 foo2zjs-device-ids.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 foo2zjs-dynamic-jbig.patch, 1.5, 1.6 foo2zjs.spec, 1.11, 1.12 sources, 1.8, 1.9
by Cedric OLIVIER
Author: cquad
Update of /cvs/free/rpms/foo2zjs/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21442/F-14
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Added Files:
foo2zjs-device-ids.patch
Log Message:
Update to 20111105 version
foo2zjs-device-ids.patch:
PPD/Minolta-magicolor_2300_DL.ppd | 1 +
PPD/Minolta-magicolor_2430_DL.ppd | 1 +
foomatic-db/printer/Minolta-magicolor_2300_DL.xml | 9 +++++++++
foomatic-db/printer/Minolta-magicolor_2430_DL.xml | 9 +++++++++
4 files changed, 20 insertions(+)
--- NEW FILE foo2zjs-device-ids.patch ---
diff -urp foo2zjs-20110909/PPD/Minolta-magicolor_2300_DL.ppd foo2zjs/PPD/Minolta-magicolor_2300_DL.ppd
--- foo2zjs-20110909/PPD/Minolta-magicolor_2300_DL.ppd 2011-08-11 19:02:05.000000000 +0100
+++ foo2zjs/PPD/Minolta-magicolor_2300_DL.ppd 2011-10-05 17:17:13.099143311 +0100
@@ -52,6 +52,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2300 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2300 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*driverName foo2zjs/foo2zjs: ""
diff -urp foo2zjs-20110909/PPD/Minolta-magicolor_2430_DL.ppd foo2zjs/PPD/Minolta-magicolor_2430_DL.ppd
--- foo2zjs-20110909/PPD/Minolta-magicolor_2430_DL.ppd 2011-08-11 19:02:05.000000000 +0100
+++ foo2zjs/PPD/Minolta-magicolor_2430_DL.ppd 2011-10-05 17:16:55.944434987 +0100
@@ -52,6 +52,7 @@
*Throughput: "1"
*LandscapeOrientation: Plus90
*TTRasterizer: Type42
+*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2430 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2430 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;"
*driverName foo2zjs/foo2zjs: ""
diff -ur foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2300_DL.xml foo2zjs/foomatic-db/printer/Minolta-magicolor_2300_DL.xml
--- foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2300_DL.xml 2006-06-08 04:29:27.000000000 +0100
+++ foo2zjs/foomatic-db/printer/Minolta-magicolor_2300_DL.xml 2011-10-05 17:45:15.920530818 +0100
@@ -48,9 +48,18 @@
<model>magicolor 2300 DL</model>
<commandset>ZJS,PJL</commandset>
</parallel>
+ <parallel>
+ <ieee1284>CLASS:PRINTER;MODEL:magicolor 2300 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+ <manufacturer>KONICA MINOLTA</manufacturer>
+ <model>magicolor 2300 DL</model>
+ <commandset>ZJS,PJL</commandset>
+ </parallel>
<snmp>
<description>MINOLTA-QMS magicolor 2300 DL</description>
</snmp>
+ <snmp>
+ <description>KONICA MINOLTA magicolor 2300 DL</description>
+ </snmp>
</autodetect>
<functionality>B</functionality>
<driver>foo2zjs</driver>
diff -ur foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2430_DL.xml foo2zjs/foomatic-db/printer/Minolta-magicolor_2430_DL.xml
--- foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2430_DL.xml 2006-06-08 04:29:42.000000000 +0100
+++ foo2zjs/foomatic-db/printer/Minolta-magicolor_2430_DL.xml 2011-10-05 17:44:37.527183609 +0100
@@ -46,9 +46,18 @@
<model>magicolor 2430 DL</model>
<commandset>ZJS,PJL</commandset>
</parallel>
+ <parallel>
+ <ieee1284>CLASS:PRINTER;MODEL:magicolor 2430 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+ <manufacturer>KONICA MINOLTA</manufacturer>
+ <model>magicolor 2430 DL</model>
+ <commandset>ZJS,PJL</commandset>
+ </parallel>
<snmp>
<description>MINOLTA-QMS magicolor 2430 DL</description>
</snmp>
+ <snmp>
+ <description>KONICA MINOLTA magicolor 2430 DL</description>
+ </snmp>
</autodetect>
<functionality>B</functionality>
<driver>foo2zjs</driver>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 8 Jun 2011 17:20:12 -0000 1.7
+++ .cvsignore 6 Nov 2011 20:23:25 -0000 1.8
@@ -1 +1 @@
-foo2zjs-20110602.tar.gz
+foo2zjs-20111105.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 93 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 44 insertions(+), 4052 deletions(-)
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foo2zjs-dynamic-jbig.patch 8 Jun 2011 17:20:12 -0000 1.5
+++ foo2zjs-dynamic-jbig.patch 6 Nov 2011 20:23:26 -0000 1.6
@@ -488,7 +488,7 @@
-
-#endif /* JBG_AR_H */
diff -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c
---- foo2zjs-patch1/jbig.c 2008-09-05 17:06:03.000000000 +0200
+--- foo2zjs-patch1/jbig.c 2011-06-09 13:54:12.000000000 +0200
+++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,3289 +0,0 @@
-/*
@@ -3613,7 +3613,7 @@
- void *file), void *file)
-{
-#define BUFLEN 4096
-- int bpp;
+- // int bpp;
- unsigned long bpl, line, i;
- unsigned k = 8;
- int p;
@@ -3630,7 +3630,7 @@
- y = jbg_dec_getheight(s);
- if (x == 0 || y == 0)
- return;
-- bpp = (s->planes + 7) / 8; /* bytes per pixel in dest image */
+- // bpp = (s->planes + 7) / 8; /* bytes per pixel in dest image */
- bpl = jbg_ceil_half(x, 3); /* bytes per line in src plane */
-
- if (iindex[s->order & 7][LAYER] == 0)
@@ -4018,8 +4018,8 @@
-
-#endif /* JBG_H */
diff -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile
---- foo2zjs-patch1/Makefile 2011-06-03 23:05:12.000000000 +0200
-+++ foo2zjs/Makefile 2011-06-07 23:13:42.242002026 +0200
+--- foo2zjs-patch1/Makefile 2011-11-05 21:45:25.000000000 +0100
++++ foo2zjs/Makefile 2011-11-06 10:45:02.857590089 +0100
@@ -19,7 +19,6 @@
# Installation prefix...
PREFIX=/usr/local
@@ -4057,45 +4057,45 @@
BINPROGS=
ifeq ($(UNAME),Linux)
-@@ -420,29 +415,29 @@
+@@ -437,29 +432,29 @@
@echo "yourself."
-foo2zjs: foo2zjs.o $(LIBJBG)
-+foo2zjs: foo2zjs.o
++foo2zjs: foo2zjs.o
$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
-foo2hp: foo2hp.o $(LIBJBG)
-+foo2hp: foo2hp.o
++foo2hp: foo2hp.o
# $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a
$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
-foo2xqx: foo2xqx.o $(LIBJBG)
-+foo2xqx: foo2xqx.o
++foo2xqx: foo2xqx.o
$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
-foo2lava: foo2lava.o $(LIBJBG)
-+foo2lava: foo2lava.o
++foo2lava: foo2lava.o
$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
-foo2qpdl: foo2qpdl.o $(LIBJBG)
-+foo2qpdl: foo2qpdl.o
++foo2qpdl: foo2qpdl.o
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
-foo2oak: foo2oak.o $(LIBJBG)
-+foo2oak: foo2oak.o
++foo2oak: foo2oak.o
$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
-foo2slx: foo2slx.o $(LIBJBG)
-+foo2slx: foo2slx.o
++foo2slx: foo2slx.o
$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
-foo2hiperc: foo2hiperc.o $(LIBJBG)
-+foo2hiperc: foo2hiperc.o
++foo2hiperc: foo2hiperc.o
$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
-@@ -510,40 +505,40 @@
+@@ -533,40 +528,40 @@
cd osx-hotplug; $(MAKE) all
endif
@@ -4104,51 +4104,51 @@
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
-gipddecode: gipddecode.o $(LIBJBG)
-+gipddecode: gipddecode.o
++gipddecode: gipddecode.o
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
-hbpldecode: hbpldecode.o $(LIBJBG)
-+hbpldecode: hbpldecode.o
++hbpldecode: hbpldecode.o
$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
-hipercdecode: hipercdecode.o $(LIBJBG)
-+hipercdecode: hipercdecode.o
++hipercdecode: hipercdecode.o
$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
-lavadecode: lavadecode.o $(LIBJBG)
-+lavadecode: lavadecode.o
++lavadecode: lavadecode.o
$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
-oakdecode: oakdecode.o $(LIBJBG)
-+oakdecode: oakdecode.o
++oakdecode: oakdecode.o
$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
-opldecode: opldecode.o $(LIBJBG)
-+opldecode: opldecode.o
++opldecode: opldecode.o
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
-qpdldecode: qpdldecode.o $(LIBJBG)
-+qpdldecode: qpdldecode.o
++qpdldecode: qpdldecode.o
$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
-splcdecode: splcdecode.o $(LIBJBG)
-+splcdecode: splcdecode.o
++splcdecode: splcdecode.o
$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
-slxdecode: slxdecode.o $(LIBJBG)
-+slxdecode: slxdecode.o
++slxdecode: slxdecode.o
$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
-xqxdecode: xqxdecode.o $(LIBJBG)
-+xqxdecode: xqxdecode.o
++xqxdecode: xqxdecode.o
$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
-zjsdecode: zjsdecode.o $(LIBJBG)
-+zjsdecode: zjsdecode.o
++zjsdecode: zjsdecode.o
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
-@@ -834,9 +829,9 @@
+@@ -857,9 +852,9 @@
done; \
fi
@@ -4161,7 +4161,7 @@
install-desktop:
#
-@@ -1051,7 +1046,7 @@
+@@ -1086,7 +1081,7 @@
-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
-rm -f *.zc *.zm
-rm -f xxx.* xxxomatic
@@ -4170,7 +4170,7 @@
-rm -f foo2oak.o oakdecode.o
-rm -f foo2xqx.o xqxdecode.o
-rm -f foo2lava.o lavadecode.o
-@@ -1078,24 +1073,24 @@
+@@ -1113,24 +1108,24 @@
#
# Header dependencies
#
@@ -4192,24 +4192,24 @@
-slxdecode.o: slx.h jbig.h
-xqxdecode.o: xqx.h jbig.h
-gipddecode.o: slx.h jbig.h
-+zjsdecode.o: zjs.h
-+foo2zjs.o: zjs.h
-+foo2oak.o: oak.h
++zjsdecode.o: zjs.h
++foo2zjs.o: zjs.h
++foo2oak.o: oak.h
+jbig.o:
+foo2hp.o: zjs.h cups.h
-+foo2xqx.o: xqx.h
++foo2xqx.o: xqx.h
+foo2lava.o:
+foo2qpdl.o: qpdl.h
-+foo2slx.o: slx.h
++foo2slx.o: slx.h
+foo2hiperc.o: hiperc.h
-+hipercdecode.o: hiperc.h
++hipercdecode.o: hiperc.h
+hbpldecode.o:
+lavadecode.o:
+qpdldecode.o:
+opldecode.o:
-+slxdecode.o: slx.h
-+xqxdecode.o: xqx.h
-+gipddecode.o: slx.h
++slxdecode.o: slx.h
++xqxdecode.o: xqx.h
++gipddecode.o: slx.h
#
# foo2* Regression tests
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/foo2zjs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- foo2zjs.spec 8 Jun 2011 17:20:12 -0000 1.11
+++ foo2zjs.spec 6 Nov 2011 20:23:26 -0000 1.12
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20110602
+%define foo2zjs_ver 20111105
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -9,12 +9,16 @@
License: GPLv2
URL: http://foo2zjs.rkkda.com/
+# command : wget -O foo2zjs-20111105.tar.gz http://foo2zjs.rkkda.com/foo2zjs.tar.gz
Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
Patch0: foo2zjs-dynamic-jbig.patch
+Patch1: foo2zjs-device-ids.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jbigkit-devel groff ghostscript
BuildRequires: bc
+# For the psdriver autoprovides
+BuildRequires: python-cups
Requires: lcms
Requires: argyllcms
Requires(post): /bin/rm
@@ -192,6 +196,9 @@
# Patch to use jbigkit-devel package instead of static jbig source code
%patch0 -p1
+# add missing 1284 Device IDs
+%patch1 -p1
+
# Remove jbig source code, jbigkit-devel package is used in BuildRequires
#rm -f jbig*
@@ -300,6 +307,7 @@
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml
%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
@@ -308,6 +316,7 @@
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2430_DL.ppd.gz
%{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz
@@ -387,6 +396,20 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Sun Nov 6 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20111105-1
+- Update to latest release
+- updated the C110 ieee1284 string
+- foomatic-db, PPDs: New printer "KONICA_MINOLTA-magicolor_2430"
+ like Minolta-magicolor_2430 except for Manufacturer
+- hplj1000: make it work with usblp and CUPS (libusb)
+- lavadecode: print the compression (JBIG or unknown)
+- lavadecode: adjust for magicolor 3730
+
+* Wed Oct 5 2011 David Woodhouse <dwmw2(a)infradead.org> 0.20110909-1
+- Update to latest release
+- Add Konica Minolta variant of 2430DL and 2300DL
+- BR python-cups to get foomatic autodeps working
+
* Thu Jun 7 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20110602-1
- New program: hbpldecode for decoding Fuji-Zerox cp105b and Dell 1250c
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 8 Jun 2011 17:20:13 -0000 1.8
+++ sources 6 Nov 2011 20:23:26 -0000 1.9
@@ -1 +1 @@
-cc9036f77bf3eff973207d7325fee192 foo2zjs-20110602.tar.gz
+d93b4f3c4fe56093786ccf4b2b98dac8 foo2zjs-20111105.tar.gz
13 years
rpms/foo2zjs/F-16 .cvsignore, 1.6, 1.7 foo2zjs-dynamic-jbig.patch, 1.4, 1.5 foo2zjs.spec, 1.10, 1.11 sources, 1.7, 1.8
by Cedric OLIVIER
Author: cquad
Update of /cvs/free/rpms/foo2zjs/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17407/F-16
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Log Message:
Update to 20111105 version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-16/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Oct 2011 17:29:48 -0000 1.6
+++ .cvsignore 6 Nov 2011 19:53:18 -0000 1.7
@@ -1 +1 @@
-foo2zjs-20110909.tar.gz
+foo2zjs-20111105.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 93 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 44 insertions(+), 4052 deletions(-)
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-16/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- foo2zjs-dynamic-jbig.patch 5 Oct 2011 17:29:49 -0000 1.4
+++ foo2zjs-dynamic-jbig.patch 6 Nov 2011 19:53:18 -0000 1.5
@@ -1,5 +1,5 @@
-diff -uNrP foo2zjs-20110909/jbig_ar.c foo2zjs/jbig_ar.c
---- foo2zjs-20110909/jbig_ar.c 2008-09-05 16:05:54.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs-patch1/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200
+++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,426 +0,0 @@
-/*
@@ -428,8 +428,8 @@
-
- return pix;
-}
-diff -uNrP foo2zjs-20110909/jbig_ar.h foo2zjs/jbig_ar.h
---- foo2zjs-20110909/jbig_ar.h 2008-09-05 16:05:54.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig_ar.h foo2zjs/jbig_ar.h
+--- foo2zjs-patch1/jbig_ar.h 2008-09-05 17:05:54.000000000 +0200
+++ foo2zjs/jbig_ar.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-/*
@@ -487,8 +487,8 @@
-int arith_decode(struct jbg_ardec_state *s, int cx);
-
-#endif /* JBG_AR_H */
-diff -uNrP foo2zjs-20110909/jbig.c foo2zjs/jbig.c
---- foo2zjs-20110909/jbig.c 2011-06-09 12:54:12.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c
+--- foo2zjs-patch1/jbig.c 2011-06-09 13:54:12.000000000 +0200
+++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,3289 +0,0 @@
-/*
@@ -3780,8 +3780,8 @@
- }
- return JBG_EINVAL | 0;
-}
-diff -uNrP foo2zjs-20110909/jbig.h foo2zjs/jbig.h
---- foo2zjs-20110909/jbig.h 2008-09-05 16:06:03.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig.h foo2zjs/jbig.h
+--- foo2zjs-patch1/jbig.h 2008-09-05 17:06:03.000000000 +0200
+++ foo2zjs/jbig.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,233 +0,0 @@
-/*
@@ -4017,9 +4017,9 @@
-int jbg_newlen(unsigned char *bie, size_t len);
-
-#endif /* JBG_H */
-diff -uNrP foo2zjs-20110909/Makefile foo2zjs/Makefile
---- foo2zjs-20110909/Makefile 2011-07-31 14:28:43.000000000 +0100
-+++ foo2zjs/Makefile 2011-10-05 14:41:17.639211316 +0100
+diff -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile
+--- foo2zjs-patch1/Makefile 2011-11-05 21:45:25.000000000 +0100
++++ foo2zjs/Makefile 2011-11-06 10:45:02.857590089 +0100
@@ -19,7 +19,6 @@
# Installation prefix...
PREFIX=/usr/local
@@ -4062,40 +4062,40 @@
-foo2zjs: foo2zjs.o $(LIBJBG)
-+foo2zjs: foo2zjs.o
++foo2zjs: foo2zjs.o
$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
-foo2hp: foo2hp.o $(LIBJBG)
-+foo2hp: foo2hp.o
++foo2hp: foo2hp.o
# $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a
$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
-foo2xqx: foo2xqx.o $(LIBJBG)
-+foo2xqx: foo2xqx.o
++foo2xqx: foo2xqx.o
$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
-foo2lava: foo2lava.o $(LIBJBG)
-+foo2lava: foo2lava.o
++foo2lava: foo2lava.o
$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
-foo2qpdl: foo2qpdl.o $(LIBJBG)
-+foo2qpdl: foo2qpdl.o
++foo2qpdl: foo2qpdl.o
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
-foo2oak: foo2oak.o $(LIBJBG)
-+foo2oak: foo2oak.o
++foo2oak: foo2oak.o
$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
-foo2slx: foo2slx.o $(LIBJBG)
-+foo2slx: foo2slx.o
++foo2slx: foo2slx.o
$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
-foo2hiperc: foo2hiperc.o $(LIBJBG)
-+foo2hiperc: foo2hiperc.o
++foo2hiperc: foo2hiperc.o
$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
-@@ -527,40 +522,40 @@
+@@ -533,40 +528,40 @@
cd osx-hotplug; $(MAKE) all
endif
@@ -4104,51 +4104,51 @@
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
-gipddecode: gipddecode.o $(LIBJBG)
-+gipddecode: gipddecode.o
++gipddecode: gipddecode.o
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
-hbpldecode: hbpldecode.o $(LIBJBG)
-+hbpldecode: hbpldecode.o
++hbpldecode: hbpldecode.o
$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
-hipercdecode: hipercdecode.o $(LIBJBG)
-+hipercdecode: hipercdecode.o
++hipercdecode: hipercdecode.o
$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
-lavadecode: lavadecode.o $(LIBJBG)
-+lavadecode: lavadecode.o
++lavadecode: lavadecode.o
$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
-oakdecode: oakdecode.o $(LIBJBG)
-+oakdecode: oakdecode.o
++oakdecode: oakdecode.o
$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
-opldecode: opldecode.o $(LIBJBG)
-+opldecode: opldecode.o
++opldecode: opldecode.o
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
-qpdldecode: qpdldecode.o $(LIBJBG)
-+qpdldecode: qpdldecode.o
++qpdldecode: qpdldecode.o
$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
-splcdecode: splcdecode.o $(LIBJBG)
-+splcdecode: splcdecode.o
++splcdecode: splcdecode.o
$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
-slxdecode: slxdecode.o $(LIBJBG)
-+slxdecode: slxdecode.o
++slxdecode: slxdecode.o
$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
-xqxdecode: xqxdecode.o $(LIBJBG)
-+xqxdecode: xqxdecode.o
++xqxdecode: xqxdecode.o
$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
-zjsdecode: zjsdecode.o $(LIBJBG)
-+zjsdecode: zjsdecode.o
++zjsdecode: zjsdecode.o
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
-@@ -851,9 +846,9 @@
+@@ -857,9 +852,9 @@
done; \
fi
@@ -4161,7 +4161,7 @@
install-desktop:
#
-@@ -1068,7 +1063,7 @@
+@@ -1086,7 +1081,7 @@
-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
-rm -f *.zc *.zm
-rm -f xxx.* xxxomatic
@@ -4170,7 +4170,7 @@
-rm -f foo2oak.o oakdecode.o
-rm -f foo2xqx.o xqxdecode.o
-rm -f foo2lava.o lavadecode.o
-@@ -1095,24 +1090,24 @@
+@@ -1113,24 +1108,24 @@
#
# Header dependencies
#
@@ -4192,24 +4192,24 @@
-slxdecode.o: slx.h jbig.h
-xqxdecode.o: xqx.h jbig.h
-gipddecode.o: slx.h jbig.h
-+zjsdecode.o: zjs.h
-+foo2zjs.o: zjs.h
-+foo2oak.o: oak.h
++zjsdecode.o: zjs.h
++foo2zjs.o: zjs.h
++foo2oak.o: oak.h
+jbig.o:
+foo2hp.o: zjs.h cups.h
-+foo2xqx.o: xqx.h
++foo2xqx.o: xqx.h
+foo2lava.o:
+foo2qpdl.o: qpdl.h
-+foo2slx.o: slx.h
++foo2slx.o: slx.h
+foo2hiperc.o: hiperc.h
-+hipercdecode.o: hiperc.h
++hipercdecode.o: hiperc.h
+hbpldecode.o:
+lavadecode.o:
+qpdldecode.o:
+opldecode.o:
-+slxdecode.o: slx.h
-+xqxdecode.o: xqx.h
-+gipddecode.o: slx.h
++slxdecode.o: slx.h
++xqxdecode.o: xqx.h
++gipddecode.o: slx.h
#
# foo2* Regression tests
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-16/foo2zjs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- foo2zjs.spec 5 Oct 2011 17:29:49 -0000 1.10
+++ foo2zjs.spec 6 Nov 2011 19:53:18 -0000 1.11
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20110909
+%define foo2zjs_ver 20111105
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -9,9 +9,10 @@
License: GPLv2
URL: http://foo2zjs.rkkda.com/
+# command : wget -O foo2zjs-20111105.tar.gz http://foo2zjs.rkkda.com/foo2zjs.tar.gz
Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
Patch0: foo2zjs-dynamic-jbig.patch
-Patch1: foo2zjs-device-ids.patch
+Patch1: foo2zjs-device-ids.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jbigkit-devel groff ghostscript
@@ -306,6 +307,7 @@
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml
%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
@@ -314,6 +316,7 @@
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2430_DL.ppd.gz
%{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz
@@ -393,6 +396,15 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Sun Nov 6 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20111105-1
+- Update to latest release
+- updated the C110 ieee1284 string
+- foomatic-db, PPDs: New printer "KONICA_MINOLTA-magicolor_2430"
+ like Minolta-magicolor_2430 except for Manufacturer
+- hplj1000: make it work with usblp and CUPS (libusb)
+- lavadecode: print the compression (JBIG or unknown)
+- lavadecode: adjust for magicolor 3730
+
* Wed Oct 5 2011 David Woodhouse <dwmw2(a)infradead.org> 0.20110909-1
- Update to latest release
- Add Konica Minolta variant of 2430DL and 2300DL
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 5 Oct 2011 17:29:49 -0000 1.7
+++ sources 6 Nov 2011 19:53:18 -0000 1.8
@@ -1 +1 @@
-3829aae821b231386630f6d0dec805d2 foo2zjs-20110909.tar.gz
+d93b4f3c4fe56093786ccf4b2b98dac8 foo2zjs-20111105.tar.gz
13 years
rpms/foo2zjs/F-15 .cvsignore, 1.7, 1.8 foo2zjs-dynamic-jbig.patch, 1.5, 1.6 foo2zjs.spec, 1.11, 1.12 sources, 1.8, 1.9
by Cedric OLIVIER
Author: cquad
Update of /cvs/free/rpms/foo2zjs/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17012/F-15
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Log Message:
Update to 20111005 version
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-15/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 5 Oct 2011 17:30:27 -0000 1.7
+++ .cvsignore 6 Nov 2011 19:51:28 -0000 1.8
@@ -1 +1 @@
-foo2zjs-20110909.tar.gz
+foo2zjs-20111105.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 93 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 44 insertions(+), 4052 deletions(-)
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-15/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foo2zjs-dynamic-jbig.patch 5 Oct 2011 17:30:27 -0000 1.5
+++ foo2zjs-dynamic-jbig.patch 6 Nov 2011 19:51:28 -0000 1.6
@@ -1,5 +1,5 @@
-diff -uNrP foo2zjs-20110909/jbig_ar.c foo2zjs/jbig_ar.c
---- foo2zjs-20110909/jbig_ar.c 2008-09-05 16:05:54.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs-patch1/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200
+++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,426 +0,0 @@
-/*
@@ -428,8 +428,8 @@
-
- return pix;
-}
-diff -uNrP foo2zjs-20110909/jbig_ar.h foo2zjs/jbig_ar.h
---- foo2zjs-20110909/jbig_ar.h 2008-09-05 16:05:54.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig_ar.h foo2zjs/jbig_ar.h
+--- foo2zjs-patch1/jbig_ar.h 2008-09-05 17:05:54.000000000 +0200
+++ foo2zjs/jbig_ar.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-/*
@@ -487,8 +487,8 @@
-int arith_decode(struct jbg_ardec_state *s, int cx);
-
-#endif /* JBG_AR_H */
-diff -uNrP foo2zjs-20110909/jbig.c foo2zjs/jbig.c
---- foo2zjs-20110909/jbig.c 2011-06-09 12:54:12.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c
+--- foo2zjs-patch1/jbig.c 2011-06-09 13:54:12.000000000 +0200
+++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,3289 +0,0 @@
-/*
@@ -3780,8 +3780,8 @@
- }
- return JBG_EINVAL | 0;
-}
-diff -uNrP foo2zjs-20110909/jbig.h foo2zjs/jbig.h
---- foo2zjs-20110909/jbig.h 2008-09-05 16:06:03.000000000 +0100
+diff -uNr foo2zjs-patch1/jbig.h foo2zjs/jbig.h
+--- foo2zjs-patch1/jbig.h 2008-09-05 17:06:03.000000000 +0200
+++ foo2zjs/jbig.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,233 +0,0 @@
-/*
@@ -4017,9 +4017,9 @@
-int jbg_newlen(unsigned char *bie, size_t len);
-
-#endif /* JBG_H */
-diff -uNrP foo2zjs-20110909/Makefile foo2zjs/Makefile
---- foo2zjs-20110909/Makefile 2011-07-31 14:28:43.000000000 +0100
-+++ foo2zjs/Makefile 2011-10-05 14:41:17.639211316 +0100
+diff -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile
+--- foo2zjs-patch1/Makefile 2011-11-05 21:45:25.000000000 +0100
++++ foo2zjs/Makefile 2011-11-06 10:45:02.857590089 +0100
@@ -19,7 +19,6 @@
# Installation prefix...
PREFIX=/usr/local
@@ -4062,40 +4062,40 @@
-foo2zjs: foo2zjs.o $(LIBJBG)
-+foo2zjs: foo2zjs.o
++foo2zjs: foo2zjs.o
$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
-foo2hp: foo2hp.o $(LIBJBG)
-+foo2hp: foo2hp.o
++foo2hp: foo2hp.o
# $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a
$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
-foo2xqx: foo2xqx.o $(LIBJBG)
-+foo2xqx: foo2xqx.o
++foo2xqx: foo2xqx.o
$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
-foo2lava: foo2lava.o $(LIBJBG)
-+foo2lava: foo2lava.o
++foo2lava: foo2lava.o
$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
-foo2qpdl: foo2qpdl.o $(LIBJBG)
-+foo2qpdl: foo2qpdl.o
++foo2qpdl: foo2qpdl.o
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
-foo2oak: foo2oak.o $(LIBJBG)
-+foo2oak: foo2oak.o
++foo2oak: foo2oak.o
$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
-foo2slx: foo2slx.o $(LIBJBG)
-+foo2slx: foo2slx.o
++foo2slx: foo2slx.o
$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
-foo2hiperc: foo2hiperc.o $(LIBJBG)
-+foo2hiperc: foo2hiperc.o
++foo2hiperc: foo2hiperc.o
$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
-@@ -527,40 +522,40 @@
+@@ -533,40 +528,40 @@
cd osx-hotplug; $(MAKE) all
endif
@@ -4104,51 +4104,51 @@
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
-gipddecode: gipddecode.o $(LIBJBG)
-+gipddecode: gipddecode.o
++gipddecode: gipddecode.o
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
-hbpldecode: hbpldecode.o $(LIBJBG)
-+hbpldecode: hbpldecode.o
++hbpldecode: hbpldecode.o
$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
-hipercdecode: hipercdecode.o $(LIBJBG)
-+hipercdecode: hipercdecode.o
++hipercdecode: hipercdecode.o
$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
-lavadecode: lavadecode.o $(LIBJBG)
-+lavadecode: lavadecode.o
++lavadecode: lavadecode.o
$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
-oakdecode: oakdecode.o $(LIBJBG)
-+oakdecode: oakdecode.o
++oakdecode: oakdecode.o
$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
-opldecode: opldecode.o $(LIBJBG)
-+opldecode: opldecode.o
++opldecode: opldecode.o
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
-qpdldecode: qpdldecode.o $(LIBJBG)
-+qpdldecode: qpdldecode.o
++qpdldecode: qpdldecode.o
$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
-splcdecode: splcdecode.o $(LIBJBG)
-+splcdecode: splcdecode.o
++splcdecode: splcdecode.o
$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
-slxdecode: slxdecode.o $(LIBJBG)
-+slxdecode: slxdecode.o
++slxdecode: slxdecode.o
$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
-xqxdecode: xqxdecode.o $(LIBJBG)
-+xqxdecode: xqxdecode.o
++xqxdecode: xqxdecode.o
$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
-zjsdecode: zjsdecode.o $(LIBJBG)
-+zjsdecode: zjsdecode.o
++zjsdecode: zjsdecode.o
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
-@@ -851,9 +846,9 @@
+@@ -857,9 +852,9 @@
done; \
fi
@@ -4161,7 +4161,7 @@
install-desktop:
#
-@@ -1068,7 +1063,7 @@
+@@ -1086,7 +1081,7 @@
-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
-rm -f *.zc *.zm
-rm -f xxx.* xxxomatic
@@ -4170,7 +4170,7 @@
-rm -f foo2oak.o oakdecode.o
-rm -f foo2xqx.o xqxdecode.o
-rm -f foo2lava.o lavadecode.o
-@@ -1095,24 +1090,24 @@
+@@ -1113,24 +1108,24 @@
#
# Header dependencies
#
@@ -4192,24 +4192,24 @@
-slxdecode.o: slx.h jbig.h
-xqxdecode.o: xqx.h jbig.h
-gipddecode.o: slx.h jbig.h
-+zjsdecode.o: zjs.h
-+foo2zjs.o: zjs.h
-+foo2oak.o: oak.h
++zjsdecode.o: zjs.h
++foo2zjs.o: zjs.h
++foo2oak.o: oak.h
+jbig.o:
+foo2hp.o: zjs.h cups.h
-+foo2xqx.o: xqx.h
++foo2xqx.o: xqx.h
+foo2lava.o:
+foo2qpdl.o: qpdl.h
-+foo2slx.o: slx.h
++foo2slx.o: slx.h
+foo2hiperc.o: hiperc.h
-+hipercdecode.o: hiperc.h
++hipercdecode.o: hiperc.h
+hbpldecode.o:
+lavadecode.o:
+qpdldecode.o:
+opldecode.o:
-+slxdecode.o: slx.h
-+xqxdecode.o: xqx.h
-+gipddecode.o: slx.h
++slxdecode.o: slx.h
++xqxdecode.o: xqx.h
++gipddecode.o: slx.h
#
# foo2* Regression tests
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-15/foo2zjs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- foo2zjs.spec 5 Oct 2011 17:30:27 -0000 1.11
+++ foo2zjs.spec 6 Nov 2011 19:51:28 -0000 1.12
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20110909
+%define foo2zjs_ver 20111105
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -9,9 +9,10 @@
License: GPLv2
URL: http://foo2zjs.rkkda.com/
+# command : wget -O foo2zjs-20111105.tar.gz http://foo2zjs.rkkda.com/foo2zjs.tar.gz
Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
Patch0: foo2zjs-dynamic-jbig.patch
-Patch1: foo2zjs-device-ids.patch
+Patch1: foo2zjs-device-ids.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jbigkit-devel groff ghostscript
@@ -306,6 +307,7 @@
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml
%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
@@ -314,6 +316,7 @@
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2430_DL.ppd.gz
%{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz
@@ -393,6 +396,15 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
+* Sun Nov 6 2011 Cédric Olivier <cedric.olivier(a)free.fr> 0.20111105-1
+- Update to latest release
+- updated the C110 ieee1284 string
+- foomatic-db, PPDs: New printer "KONICA_MINOLTA-magicolor_2430"
+ like Minolta-magicolor_2430 except for Manufacturer
+- hplj1000: make it work with usblp and CUPS (libusb)
+- lavadecode: print the compression (JBIG or unknown)
+- lavadecode: adjust for magicolor 3730
+
* Wed Oct 5 2011 David Woodhouse <dwmw2(a)infradead.org> 0.20110909-1
- Update to latest release
- Add Konica Minolta variant of 2430DL and 2300DL
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-15/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 5 Oct 2011 17:30:27 -0000 1.8
+++ sources 6 Nov 2011 19:51:28 -0000 1.9
@@ -1 +1 @@
-3829aae821b231386630f6d0dec805d2 foo2zjs-20110909.tar.gz
+d93b4f3c4fe56093786ccf4b2b98dac8 foo2zjs-20111105.tar.gz
13 years
rpms/libaacs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libaacs/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsb24041/rpms/libaacs/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module libaacs
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: libaacs
# $Id: Makefile,v 1.1 2011/11/06 16:45:45 kwizart Exp $
NAME := libaacs
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
13 years