rpms/gl2ps/devel gl2ps-buildsys.patch, NONE, 1.1 gl2ps-noexit.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gl2ps.spec, 1.4, 1.5 sources, 1.2, 1.3
Dominik Mierzejewski
rathann at fedoraproject.org
Sun Aug 23 18:09:53 UTC 2009
Author: rathann
Update of /cvs/pkgs/rpms/gl2ps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2439
Modified Files:
.cvsignore gl2ps.spec sources
Added Files:
gl2ps-buildsys.patch gl2ps-noexit.patch
Log Message:
* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 1.3.3-1
- updated to 1.3.3
- removed calls to exit(3)
- added a simple build system (Makefile)
- dropped libtool dependency
- 1.3.3 added a new symbol, so made it versioned
- added examples to -devel docs
gl2ps-buildsys.patch:
Makefile | 34 ++++++++++++++++++++++++++++++++++
Version | 4 ++++
2 files changed, 38 insertions(+)
--- NEW FILE gl2ps-buildsys.patch ---
diff -up gl2ps-1.3.3/Makefile.b gl2ps-1.3.3/Makefile
--- gl2ps-1.3.3/Makefile.b 2009-08-23 19:58:39.000000000 +0200
+++ gl2ps-1.3.3/Makefile 2009-08-23 19:47:15.000000000 +0200
@@ -0,0 +1,34 @@
+OPTFLAGS = -O2 -Wall
+EXTRALIBS = -lGL -lm
+CFLAGS += $(OPTFLAGS) -fPIC
+LDFLAGS += $(EXTRALIBS)
+LDFLAGS += -Wl,--version-script=Version
+MAJOR = 0
+MINOR = 0
+MICRO = 0
+NAME = gl2ps
+HEADERS = gl2ps.h
+OBJS = gl2ps.o
+SLIBNAME_SO = lib$(NAME).so
+SLIBNAME_WITH_MAJOR = $(SLIBNAME_SO).$(MAJOR)
+SLIBNAME = $(SLIBNAME_WITH_MAJOR).$(MINOR).$(MICRO)
+SLIBDIR = /usr/lib
+INCLUDEDIR = /usr/include
+
+%.o: %.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+all: $(SLIBNAME)
+
+clean:
+ rm -f $(OBJS) $(SLIBNAME)
+
+$(SLIBNAME): $(OBJS)
+ $(CC) -shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR) -o $@ $(filter %.o,$^) $(LDFLAGS)
+
+install:
+ mkdir -p $(DESTDIR){$(SLIBDIR),$(INCLUDEDIR)}
+ install -pm755 $(SLIBNAME) $(DESTDIR)$(SLIBDIR)
+ ln -s $(SLIBNAME) $(DESTDIR)$(SLIBDIR)/$(SLIBNAME_WITH_MAJOR)
+ ln -s $(SLIBNAME_WITH_MAJOR) $(DESTDIR)$(SLIBDIR)/$(SLIBNAME_SO)
+ install -pm644 $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
diff -up gl2ps-1.3.3/Version.b gl2ps-1.3.3/Version
--- gl2ps-1.3.3/Version.b 2009-08-23 19:58:44.000000000 +0200
+++ gl2ps-1.3.3/Version 2009-08-23 19:58:01.000000000 +0200
@@ -0,0 +1,4 @@
+GL2PS_1.3.3 {
+ global:
+ gl2psGetOptions;
+};
gl2ps-noexit.patch:
gl2ps.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gl2ps-noexit.patch ---
diff -up gl2ps-1.3.3/gl2ps.c.noexit gl2ps-1.3.3/gl2ps.c
--- gl2ps-1.3.3/gl2ps.c.noexit 2009-02-28 23:08:14.000000000 +0100
+++ gl2ps-1.3.3/gl2ps.c 2009-08-23 19:02:17.000000000 +0200
@@ -319,7 +319,7 @@ static void *gl2psMalloc(size_t size)
ptr = malloc(size);
if(!ptr){
gl2psMsg(GL2PS_ERROR, "Couldn't allocate requested memory");
- exit(1);
+ return(NULL);
}
return(ptr);
}
@@ -330,7 +330,7 @@ static void *gl2psRealloc(void *ptr, siz
ptr = realloc(ptr, size);
if(!ptr){
gl2psMsg(GL2PS_ERROR, "Couldn't reallocate requested memory");
- exit(1);
+ return(NULL);
}
return(ptr);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 12 Jul 2008 23:25:32 -0000 1.2
+++ .cvsignore 23 Aug 2009 18:09:53 -0000 1.3
@@ -1 +1 @@
-gl2ps-1.3.2.tgz
+gl2ps-1.3.3.tgz
Index: gl2ps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/devel/gl2ps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gl2ps.spec 25 Jul 2009 00:16:55 -0000 1.4
+++ gl2ps.spec 23 Aug 2009 18:09:53 -0000 1.5
@@ -1,15 +1,15 @@
Summary: An OpenGL to PostScript printing library
Summary(pl): Biblioteka drukowania z OpenGL-a do PostScriptu
Name: gl2ps
-Version: 1.3.2
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
License: LGPLv2+ or GL2PS
Group: System Environment/Libraries
Source0: http://www.geuz.org/gl2ps/src/%{name}-%{version}.tgz
-# Source0-md5: 15cf4a6a790c109fc03c6601660d73a7
+Patch0: %{name}-noexit.patch
+Patch1: %{name}-buildsys.patch
URL: http://www.geuz.org/gl2ps/
BuildRequires: libGL-devel
-BuildRequires: libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
%description
@@ -61,19 +61,15 @@ Pliki nagłówkowe biblioteki GL2PS.
%prep
%setup -q
+%patch0 -p1 -b .noexit
+%patch1 -p1 -b .b
%build
-libtool --mode=compile %{__cc} %{optflags} -c -o gl2ps.lo gl2ps.c
-libtool --mode=link %{__cc} %{optflags} -o libgl2ps.la gl2ps.lo -rpath %{_libdir} -lGL -lm
+make OPTFLAGS="%{optflags}" %{?_smp_mflags}
%install
rm -rf %{buildroot}
-install -d %{buildroot}{%{_libdir},%{_includedir}}
-
-libtool --mode=install install libgl2ps.la %{buildroot}%{_libdir}
-install -pm644 gl2ps.h %{buildroot}%{_includedir}
-
-rm %{buildroot}%{_libdir}/libgl2ps.{l,}a
+make SLIBDIR=%{_libdir} DESTDIR=%{buildroot} install
%clean
rm -rf %{buildroot}
@@ -88,11 +84,19 @@ rm -rf %{buildroot}
%files devel
%defattr(644,root,root,755)
-%doc gl2ps.pdf TODO
-%attr(755,root,root) %{_libdir}/libgl2ps.so
+%doc gl2ps.pdf TODO gl2psTest*.c
+%{_libdir}/libgl2ps.so
%{_includedir}/gl2ps.h
%changelog
+* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 1.3.3-1
+- updated to 1.3.3
+- removed calls to exit(3)
+- added a simple build system (Makefile)
+- dropped libtool dependency
+- 1.3.3 added a new symbol, so made it versioned
+- added examples to -devel docs
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gl2ps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 12 Jul 2008 23:25:32 -0000 1.2
+++ sources 23 Aug 2009 18:09:53 -0000 1.3
@@ -1 +1 @@
-15cf4a6a790c109fc03c6601660d73a7 gl2ps-1.3.2.tgz
+f2f513f0cd2b5e49902c503edc291487 gl2ps-1.3.3.tgz
More information about the fedora-extras-commits
mailing list