Hello community,
here is the log from the commit of package bff4 for openSUSE:12.2 checked in at
2012-06-26 15:14:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/bff4 (Old)
and /work/SRC/openSUSE:12.2/.bff4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bff4", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.2/bff4/bff4.changes 2012-06-25 15:15:50.000000000
+0200
+++ /work/SRC/openSUSE:12.2/.bff4.new/bff4.changes 2012-06-26
15:14:44.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jun 19 12:31:02 UTC 2012 - a...@mizerski.pl
+
+- added license-clarification.txt (bnc#761551) and updated
+ license tag
+- updated bff4.c
+- renamed arg.patch -> bff4-arg.patch and added patch info
+- improved and cleaned-up spec file
+
+-------------------------------------------------------------------
Old:
----
arg.patch
New:
----
bff4-arg.patch
license-clarification.txt
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bff4.spec ++++++
--- /var/tmp/diff_new_pack.CNqwhE/_old 2012-06-26 15:14:44.000000000 +0200
+++ /var/tmp/diff_new_pack.CNqwhE/_new 2012-06-26 15:14:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bff4
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,18 @@
#
-
Name: bff4
Version: 1
-Release: 1
-License: OSI_COMPLIANT_FREE(Public domain)
-Source0: %{name}.c
-Patch0: arg.patch
-Group: Development/Languages/Other
+Release: 0
Summary: Fast Brainfuck interpreter
+License: SUSE-Public-Domain
+Group: Development/Languages/Other
Url: http://mazonka.com/brainf/
-
+Source0: %{name}.c
+# bnc#761551
+Source1: license-clarification.txt
+# PATCH-FEATURE-OPENSUSE bff4-arg.patch a...@mizerski.pl -- add option to pass
input file as command line argument
+Patch0: %{name}-arg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -34,25 +35,23 @@
This interpreter has only one input: program and input to the program have to
be separated with ! e.g. ",.!a" prints 'a' To use it in interactive mode paste
your program as input.
-This program can be compiled with LNR macro defined. LNR is another
optimization of linear loops (where '<>' balanced), e.g. [->+>++<<]. Linear
loop is then executed in one step.
+This program is compiled with optimization of linear loops (where '<>'
balanced), e.g. [->+>++<<]. Linear loop is then executed in one step.
Oleg Mazonka 4.12.06 http://mazonka.com/
%prep
-%__cp %{SOURCE0} .
+cp %{SOURCE0} %{SOURCE1} .
%patch0
%build
-gcc %{SOURCE0} -o %{name} %optflags
-gcc %{SOURCE0} -DLNR -o %{name}lnr %optflags
+gcc %{name}.c -o %{name} %{optflags}
%install
-%__install -D -m 755 %{name} %buildroot%{_bindir}/%{name}
-%__install -D -m 755 %{name}lnr %buildroot%{_bindir}/%{name}lnr
+install -D -m 755 %{name} %{buildroot}%{_bindir}/%{name}
%files
%defattr(-,root,root)
%{_bindir}/%{name}
-%{_bindir}/%{name}lnr
+%doc license-clarification.txt
%changelog
++++++ bff4-arg.patch ++++++
--- bff4.c 2007-06-13 06:28:04.000000000 +0200
+++ bff4_mod.c 2010-01-25 19:54:47.538918492 +0100
@@ -49,13 +49,15 @@ void * zalloc(void *p, int sz, int osz)
}
#define zalloci(p,sz,osz) zalloc(p,(sz)*sizeof(int),(osz)*sizeof(int));
+FILE * istrm;
+
int getbf()
{
int a;
next:
- a = getchar();
+ a = getc(istrm);
if( a==-1 ) return -1;
- if( !strchr(",.[]+-<>!",a) ) goto next;
+ if( !strchr(",.[]+-<>!",a) ) goto next;
return a;
}
@@ -119,11 +121,24 @@ int consume(op *o)
return a;
}
-int main()
+int main(int argc, char *argv[])
{
op * o=0, *z, *zend;
int sz=0, i, *m, mp, msz;
- int a = getbf();
+ int a;
+
+ if(argc == 1) {
+ istrm = stdin;
+ }
+ else {
+ istrm = fopen(argv[1],"r");
+ if (istrm == NULL) {
+ printf("error at opening file: %s\n", argv[1]);
+ return 1;
+ }
+ }
+
+ a = getbf();
for(;;sz++)
{
o = zalloc(o,(sz+1)*sizeof(op),sz*sizeof(op));
@@ -229,6 +244,7 @@ int main()
printf("\n");
#endif
}
+ fclose(istrm);
return 0;
}
++++++ bff4.c ++++++
--- /var/tmp/diff_new_pack.CNqwhE/_old 2012-06-26 15:14:44.000000000 +0200
+++ /var/tmp/diff_new_pack.CNqwhE/_new 2012-06-26 15:14:44.000000000 +0200
@@ -6,11 +6,11 @@
program have to be separated with ! e.g. ",.!a" prints 'a'
To use it in interactive mode paste your program as input.
- This program can be compiled with LNR macro defined.
- LNR is another optimization of linear loops (where '<>' balanced), e.g.
[->+>++<<].
+ This program can be compiled with NOLNR macro defined.
+ NOLNR disables optimization of linear loops (where '<>' balanced), e.g.
[->+>++<<].
Linear loop is then executed in one step.
- Oleg Mazonka 4.12.06 http://mazonka.com/
+ Oleg Mazonka 4 Dec 2006 http://mazonka.com/
*/
@@ -134,7 +134,7 @@
if( a==']' )
{
int l=1, i=sz;
- while(l&&i>=0){ i--;l+=(o[i].c==']')-(o[i].c=='['); }
+ while(l&&i>=0) if(i--) l+=(o[i].c==']')-(o[i].c=='[');
if( i<0 ){ printf("unbalanced ']'\n"); exit(1); }
o[i].igo = sz;
o[sz].igo = i;
@@ -145,7 +145,7 @@
for( i=0;i<sz;i++ )
{
o[i].go = &o[o[i].igo];
-#ifdef LNR
+#ifndef NOLNR
if( o[i].c == '[' && o[i].igo == i+1 && o[i].shift==0 &&
o[i].off <= 0 )
{
o[i].linear = -o[i].d[-o[i].off];
@@ -198,7 +198,7 @@
}
-#ifdef LNR
+#ifndef NOLNR
if( z->linear )
{
int del = m[mp]/z->linear;
++++++ license-clarification.txt ++++++
Hi Adam,
You can use 'public domain' or another the least restrictive license.
Cheers,
- Oleg
-----Original Message-----
From: Adam Mizerski [mailto:a...@mizerski.pl]
Sent: Sunday, 24 January 2010 7:35 AM
To: mazo...@gmail.com
Subject: question about bff4
Hi.
Your brainfuck interpreter is pretty cool, and I wanted to build it on
openSuSE Build Service (http://en.opensuse.org/Build_Service). My
question is:
Under which license is source code of bff4 released?
(GPL, BSD, or maybe something else...)
It's needed to be written in package specification and I don't want to
leave it blank, or to choose by myself.
--
Adam Mizerski
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
