Changeset - 885741503728
Parent rev.
Child rev.
[Not reviewed]
0 5 0
Vitaly Takmazov - 7 years ago 2018-03-23 14:28:27
vitalyster@gmail.com
add libjsoncpp-dev to dependencies
5 files changed with 7 insertions and 6 deletions:
.travis.yml
2
2
Dockerfile
1
1
Dockerfile.stretch
2
2
packaging/debian/debian/control
1
1
packaging/fedora/spectrum2.spec
1
0 comments (0 inline, 0 general)
.travis.yml
➞
Show inline comments
 
@@ -11,8 +11,8 @@ matrix:
 
before_script:
 
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
      brew update;
 
      brew install cppunit protobuf log4cxx popt;
 
      travis_wait 30 brew install --devel libswiften;
 
      brew install cppunit protobuf log4cxx popt jsoncpp;
 
      travis_wait 30 brew install libswiften;
 
    fi
 
script:
 
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
Dockerfile
➞
Show inline comments
 
@@ -6,7 +6,7 @@ ARG commit=unknown
 
RUN echo $commit
 

			




	
	
	
		
 
# Spectrum 2

			




	
	
	
		
 
RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel gettext libgcrypt-devel libwebp-devel libpurple-devel zlib-devel json-glib-devel python-pip zlib-devel libjpeg-devel python-devel mysql-devel popt-devel git libev-libevent-devel qt-devel dbus-glib-devel libcurl-devel wget mercurial libtool libgnome-keyring-devel nss-devel -y && \

			




	
	
	
		
 
RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel gettext libgcrypt-devel libwebp-devel libpurple-devel zlib-devel json-glib-devel python-pip zlib-devel libjpeg-devel python-devel mysql-devel popt-devel git libev-libevent-devel qt-devel dbus-glib-devel libcurl-devel wget mercurial libtool libgnome-keyring-devel nss-devel jsoncpp-devel -y && \

			




	
	
	
		
 
	echo "---> Installing Spectrum 2" && \

			




	
	
	
		
 
		git clone git://github.com/hanzz/spectrum2.git && \

			




	
	
	
		
 
		cd spectrum2 && \

			




        

    


    
    

    

        

                

                    Dockerfile.stretch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,11 +6,11 @@ RUN echo force-confold | tee -a /etc/dpkg/dpkg.cfg

			




	
	
	
		
 
RUN apt-get update -qq

			




	
	
	
		
 
RUN apt-get install -y --force-yes apt-transport-https curl gnupg1

			




	
	
	
		
 
RUN echo "deb https://packages.spectrum.im/spectrum2/ stretch main" | tee -a /etc/apt/sources.list

			




	
	
	
		
 
RUN echo "deb https://swift.im/packages/debian/stretch beta main" | tee -a /etc/apt/sources.list

			




	
	
	
		
 
RUN echo "deb https://swift.im/packages/debian/stretch release main" | tee -a /etc/apt/sources.list

			




	
	
	
		
 
RUN curl https://swift.im/keys/packages.key | apt-key add -

			




	
	
	
		
 
RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-keys 1AFDEA51

			




	
	
	
		
 
RUN apt-get update -qq

			




	
	
	
		
 
RUN apt-get install -y --force-yes build-essential git cmake prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler libpurple-dev libglib2.0-dev libdbus-glib-1-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev libminiupnpc-dev libnatpmp-dev libssl-dev libcurl4-openssl-dev libidn11-dev libxml2-dev libsqlite3-dev libqt4-dev

			




	
	
	
		
 
RUN apt-get install -y --force-yes build-essential git cmake prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler libpurple-dev libglib2.0-dev libdbus-glib-1-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev libminiupnpc-dev libnatpmp-dev libssl-dev libcurl4-openssl-dev libidn11-dev libxml2-dev libsqlite3-dev libqt4-dev libjsoncpp-dev

			




	
	
	
		
 
RUN git clone git://github.com/SpectrumIM/spectrum2.git && cd spectrum2

			




	
	
	
		
 
RUN cd spectrum2 && cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON . && make

			




	
	
	
		
 
RUN cd spectrum2 && make extended_test

			




        

    


    
    

    

        

                

                    packaging/debian/debian/control
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~), libpurple-dev, libswiften-dev,

			




	
	
	
		
 
 libprotobuf-dev, libmysqlclient-dev | default-libmysqlclient-dev, liblog4cxx10-dev, protobuf-compiler,

			




	
	
	
		
 
 libpopt-dev, libdbus-glib-1-dev, libpqxx-dev | libpqxx3-dev, cmake, libev-libevent-dev | libevent-dev, libboost-all-dev,

			




	
	
	
		
 
 libqt4-dev, libidn11-dev, libxml2-dev, libavahi-client-dev, libavahi-common-dev,

			




	
	
	
		
 
 libcurl4-openssl-dev, libcommuni-dev, libsqlite3-dev

			




	
	
	
		
 
 libcurl4-openssl-dev, libcommuni-dev, libsqlite3-dev, libjsoncpp-dev

			




	
	
	
		
 
Standards-Version: 3.9.6

			




	
	
	
		
 
VCS-Browser: http://git.fsinf.at/apt/spectrum2

			




	
	
	
		
 
VCS-Git: https://git.fsinf.at/apt/spectrum2.git

			




        

    


    
    

    

        

                

                    packaging/fedora/spectrum2.spec
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,6 +31,7 @@ BuildRequires: libcurl-devel

			




	
	
	
		
 
BuildRequires: libev-libevent-devel

			




	
	
	
		
 
BuildRequires: libpqxx-devel

			




	
	
	
		
 
BuildRequires: libpurple-devel

			




	
	
	
		
 
BuildRequires: jsoncpp-devel

			




	
	
	
		
 
Requires:      libtransport%{?_isa} = %{version}-%{release}

			




	
	
	
		
 

			




	
	
	
		
 
%description

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-30713
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support