rpms/libQGLViewer/EL-6 libQGLViewer-2.3.6-dbg.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 libQGLViewer.spec, 1.5, 1.6 sources, 1.2, 1.3 libQGLViewer-2.3.1-dbg.patch, 1.1, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Jul 12 06:53:02 UTC 2010
Author: lkundrak
Update of /cvs/pkgs/rpms/libQGLViewer/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv577/EL-6
Modified Files:
.cvsignore import.log libQGLViewer.spec sources
Added Files:
libQGLViewer-2.3.6-dbg.patch
Removed Files:
libQGLViewer-2.3.1-dbg.patch
Log Message:
Import from devel
libQGLViewer-2.3.6-dbg.patch:
QGLViewer/QGLViewer.pro | 4 ----
designerPlugin/designerPlugin.pro | 4 ----
2 files changed, 8 deletions(-)
--- NEW FILE libQGLViewer-2.3.6-dbg.patch ---
diff -up libQGLViewer-2.3.6/designerPlugin/designerPlugin.pro.dbg libQGLViewer-2.3.6/designerPlugin/designerPlugin.pro
--- libQGLViewer-2.3.6/designerPlugin/designerPlugin.pro.dbg 2010-05-23 05:19:27.000000000 +0200
+++ libQGLViewer-2.3.6/designerPlugin/designerPlugin.pro 2010-07-02 15:53:32.000000000 +0200
@@ -172,10 +172,6 @@ unix|win32-g++ {
}
}
- # Remove debugging options in release mode makes files much smaller
- release:QMAKE_CFLAGS_RELEASE -= -g
- release:QMAKE_CXXFLAGS_RELEASE -= -g
-
# Intermediate files are created in an hidden folder
MOC_DIR = .moc
OBJECTS_DIR = .obj
diff -up libQGLViewer-2.3.6/QGLViewer/QGLViewer.pro.dbg libQGLViewer-2.3.6/QGLViewer/QGLViewer.pro
--- libQGLViewer-2.3.6/QGLViewer/QGLViewer.pro.dbg 2010-05-23 05:19:18.000000000 +0200
+++ libQGLViewer-2.3.6/QGLViewer/QGLViewer.pro 2010-07-02 15:53:58.000000000 +0200
@@ -154,10 +154,6 @@ unix {
QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
}
- # Make much smaller libraries (and packages) by removing debugging informations
- QMAKE_CFLAGS_RELEASE -= -g
- QMAKE_CXXFLAGS_RELEASE -= -g
-
# install header
include.path = $${INCLUDE_DIR}/QGLViewer
# Should be $$replace(TRANSLATIONS, .ts, .qm), but 'replace' only appeared in Qt 4.3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 30 Mar 2009 21:59:37 -0000 1.3
+++ .cvsignore 12 Jul 2010 06:53:01 -0000 1.4
@@ -1,2 +1 @@
-libQGLViewer-2.3.1.tar.gz
-clog
+libQGLViewer-2.3.6.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 30 Mar 2009 21:52:32 -0000 1.1
+++ import.log 12 Jul 2010 06:53:02 -0000 1.2
@@ -1 +1,2 @@
libQGLViewer-2_3_1-6_fc10:HEAD:libQGLViewer-2.3.1-6.fc10.src.rpm:1238449924
+libQGLViewer-2_3_6-1_fc14:EL-6:libQGLViewer-2.3.6-1.fc14.src.rpm:1278917508
Index: libQGLViewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/EL-6/libQGLViewer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- libQGLViewer.spec 25 Jul 2009 05:08:29 -0000 1.5
+++ libQGLViewer.spec 12 Jul 2010 06:53:02 -0000 1.6
@@ -1,6 +1,6 @@
Name: libQGLViewer
-Version: 2.3.1
-Release: 10%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
Summary: Qt based OpenGL generic 3D viewer library
Group: System Environment/Libraries
@@ -14,7 +14,7 @@ Patch0: libQGLViewer-2.3.1-exit.
# libQGLViewer .pro files explicitely remove "-g" from compile flags. Make
# them back.
-Patch1: libQGLViewer-2.3.1-dbg.patch
+Patch1: libQGLViewer-2.3.6-dbg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +52,7 @@ BuildArch: noarch
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .exit
-%patch1 -p1 -b .dbg
+%patch1 -p1 -b dbg
# Fix the encoding of several files, so that they all use utf-8.
for f in doc/*.html doc/examples/*.html \
@@ -77,8 +77,14 @@ cd QGLViewer
%{_qt4_qmake} \
LIB_DIR=%{_libdir} \
DOC_DIR=%{_defaultdocdir}/%{name}-%{version} \
- INCLUDE_DIR=%{_includedir}
+ INCLUDE_DIR=%{_includedir} \
+ TARGET_x=%{name}.so.%{version}
+# The TARGET_x variable gives the SONAME. However, qmake behavior is not
+# correct when the SONAME is customized: it create wrong symbolic links
+# that must be cleaned after the installation.
+
make %{?_smp_mflags}
+
cd ../designerPlugin
%{_qt4_qmake} LIB_DIR=../QGLViewer
make %{?_smp_mflags}
@@ -89,6 +95,11 @@ cd QGLViewer
make -f Makefile -e INSTALL_ROOT=$RPM_BUILD_ROOT install_target install_include
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
rm $RPM_BUILD_ROOT%{_libdir}/libQGLViewer.prl
+
+# Clean symbolic links
+rm $RPM_BUILD_ROOT%{_libdir}/libQGLViewer.so.?.? \
+ $RPM_BUILD_ROOT%{_libdir}/libQGLViewer.so.%{version}\\*
+
cd ../designerPlugin
make -e INSTALL_ROOT=$RPM_BUILD_ROOT install
@@ -104,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README LICENCE CHANGELOG GPL_EXCEPTION
-%{_libdir}/libQGLViewer.so.2*
+%{_libdir}/libQGLViewer.so.%{version}
%files devel
%defattr(-,root,root,-)
@@ -118,6 +129,19 @@ rm -rf $RPM_BUILD_ROOT
%doc examples
%changelog
+* Fri Jul 2 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.6-1
+- New upstream release
+- Fix an incorrect changelog entry
+
+* Wed Apr 21 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.5-2
+- Tweak the configuration and compilation so that the soname of the library is
+ equal to its soversion. The binary compilatibility is not ensured by
+ upstream.
+
+* Tue Apr 20 2010 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.5-1
+- New upstream release
+- Rebase the dbg patch
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -127,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Apr 1 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-8
- Add a patch, so that "-g" flags are not removed.
-* Mon Mar 30 2009 <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-7
+* Mon Mar 30 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-7
- Remove glibc-common from BR:
* Tue Jan 6 2009 Laurent Rineau <Laurent.Rineau__fedora at normalesup.org> - 2.3.1-6
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libQGLViewer/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 30 Mar 2009 21:52:32 -0000 1.2
+++ sources 12 Jul 2010 06:53:02 -0000 1.3
@@ -1 +1 @@
-bede65612dd6230127f844bc5bdf2c9f libQGLViewer-2.3.1.tar.gz
+74453a6e50dcdf3044c0f9d5f93f3db0 libQGLViewer-2.3.6.tar.gz
--- libQGLViewer-2.3.1-dbg.patch DELETED ---
More information about the scm-commits
mailing list