Hello community, here is the log from the commit of package libSOIL for openSUSE:Factory checked in at 2013-03-30 14:59:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libSOIL (Old) and /work/SRC/openSUSE:Factory/.libSOIL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libSOIL", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:Factory/.libSOIL.new/libSOIL.changes 2013-03-30 14:59:03.000000000 +0100 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Wed Mar 27 07:56:25 UTC 2013 - cfarrell@suse.com + +- license update: SUSE-Public-Domain and MIT + If the licenses are not aggregated the MIT should be entered as license + +------------------------------------------------------------------- +Thu Mar 21 14:46:07 UTC 2013 - joop.boonen@opensuse.org + +- Corrected the License + +------------------------------------------------------------------- +Sun Oct 24 18:18:18 UTC 2010 - reddwarf@opensuse.org + +- Initial package + New: ---- libSOIL-makefile.patch libSOIL.changes libSOIL.spec soil.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libSOIL.spec ++++++ # # spec file for package libSOIL # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define soname 1 Name: libSOIL Version: 1.07.20080707 Release: 0 Summary: Simple OpenGL Image Library License: SUSE-Public-Domain and MIT Group: System/Libraries Url: http://lonesock.net/soil.html Source0: http://www.lonesock.net/files/soil.zip Patch0: %{name}-makefile.patch BuildRequires: Mesa-devel BuildRequires: unzip %description SOIL is a tiny C library used primarily for uploading textures into OpenGL. It supports loading BMP, PNG, JPG, TGA, DDS, PSD and HDR files as well as saving into TGA, BMP and DDS Files. It is also able to perform common functions needed in loading OpenGL textures. %package -n %{name}%{soname} Summary: Simple OpenGL Image Library Group: System/Libraries %description -n %{name}%{soname} SOIL is a tiny C library used primarily for uploading textures into OpenGL. It supports loading BMP, PNG, JPG, TGA, DDS, PSD and HDR files as well as saving into TGA, BMP and DDS Files. It is also able to perform common functions needed in loading OpenGL textures. %package devel Summary: Libsoil development files Group: Development/Libraries/C and C++ Requires: %{name}%{soname} = %{version} %description devel Headers and libraries to program against %{name} %prep %setup -q -n Simple\ OpenGL\ Image\ Library %patch0 %build export CFLAGS='%{optflags}' make %{?_smp_mflags} -C src -f ../projects/makefile/alternate\ Makefile.txt %install %make_install LIBDIR=%{_libdir} -C src -f ../projects/makefile/alternate\ Makefile.txt %post -n %{name}%{soname} -p /sbin/ldconfig %postun -n %{name}%{soname} -p /sbin/ldconfig %files -n %{name}%{soname} %defattr(0644, root, root, 0755) %doc soil.html %{_libdir}/%{name}.so.%{soname}* %files devel %defattr(0644, root, root, 0755) %{_libdir}/%{name}.so %{_includedir}/SOIL %changelog ++++++ libSOIL-makefile.patch ++++++ --- projects/makefile/alternate Makefile.txt 2008-07-07 18:13:28.000000000 +0200 +++ projects/makefile/alternate Makefile.txt 2010-10-24 19:01:40.475643694 +0200 @@ -1,16 +1,16 @@ MAKE = make CC = gcc -INSTALL_FILE = install -p -o root -g root -m 644 -INSTALL_DIR = install -p -o root -g root -d +INSTALL_FILE = install -p -m 644 +INSTALL_DIR = install -p -d LN = ln -s RM = rm -fv -CFLAGS += -c -O2 -Wall +CFLAGS += -c -O2 -Wall -fPIC LDFLAGS += CFILES = image_DXT.c image_helper.c SOIL.c stb_image_aug.c OFILES = $(CFILES:.c=.o) LIBNAME = libSOIL -VERSION = 1.07-20071110 +VERSION = 1.07-20080707 MAJOR = 1 HFILES = SOIL.h image_DXT.h image_helper.h \ @@ -27,15 +27,15 @@ lib: $(OFILES) # create static library - ar -cvq $(LIBNAME).a $(OFILES) + #ar -cvq $(LIBNAME).a $(OFILES) # create shared library - gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) + gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) -lGL -lm install: $(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR) $(INSTALL_FILE) $(HFILES) $(DESTDIR)/$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)/$(LIBDIR) - $(INSTALL_FILE) $(AFILE) $(DESTDIR)/$(LIBDIR) + #$(INSTALL_FILE) $(AFILE) $(DESTDIR)/$(LIBDIR) $(INSTALL_FILE) $(SOFILE) $(DESTDIR)/$(LIBDIR) ( cd $(DESTDIR)/$(LIBDIR) && $(LN) $(SOFILE) $(LIBNAME).so.$(MAJOR) \ && $(LN) $(SOFILE) $(LIBNAME).so ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org